From 7c01c524a029097b988968d28cc7581e6cdd7964 Mon Sep 17 00:00:00 2001 From: Reinis Martinsons Date: Fri, 24 Jan 2025 14:55:40 +0000 Subject: [PATCH 1/4] feat: deploy on devnet Signed-off-by: Reinis Martinsons --- Anchor.toml | 8 ++++---- programs/multicall-handler/src/lib.rs | 2 +- programs/svm-spoke/src/lib.rs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Anchor.toml b/Anchor.toml index 2a068f518..aa2cfd968 100644 --- a/Anchor.toml +++ b/Anchor.toml @@ -5,13 +5,13 @@ resolution = true skip-lint = false [programs.localnet] -multicall_handler = "27dua7HMuaZrAc6PRfxmvshHChypFLzZVSpKKaDAPjsq" -svm_spoke = "D1WcTLKRyN4TuqnfMBGPvc16nACHfNhFPbgWNExb1aur" +multicall_handler = "Fk1RpqsfeWt8KnFCTW9NQVdVxYvxuqjGn6iPB9wrmM8h" +svm_spoke = "JAZWcGrpSWNPTBj8QtJ9UyQqhJCDhG9GJkDeMf5NQBiq" test = "8tsEfDSiE4WUMf97oyyyasLAvWwjeRZb2GByh4w7HckA" [programs.devnet] -multicall_handler = "27dua7HMuaZrAc6PRfxmvshHChypFLzZVSpKKaDAPjsq" -svm_spoke = "D1WcTLKRyN4TuqnfMBGPvc16nACHfNhFPbgWNExb1aur" +multicall_handler = "Fk1RpqsfeWt8KnFCTW9NQVdVxYvxuqjGn6iPB9wrmM8h" +svm_spoke = "JAZWcGrpSWNPTBj8QtJ9UyQqhJCDhG9GJkDeMf5NQBiq" [registry] url = "https://api.apr.dev" diff --git a/programs/multicall-handler/src/lib.rs b/programs/multicall-handler/src/lib.rs index 83605fd2b..6bc38b264 100644 --- a/programs/multicall-handler/src/lib.rs +++ b/programs/multicall-handler/src/lib.rs @@ -22,7 +22,7 @@ security_txt! { // If changing the program ID, make sure to check that the resulting handler_signer PDA has the highest bump of 255 so // to minimize the compute cost when finding the PDA. -declare_id!("27dua7HMuaZrAc6PRfxmvshHChypFLzZVSpKKaDAPjsq"); +declare_id!("Fk1RpqsfeWt8KnFCTW9NQVdVxYvxuqjGn6iPB9wrmM8h"); #[program] pub mod multicall_handler { diff --git a/programs/svm-spoke/src/lib.rs b/programs/svm-spoke/src/lib.rs index 076a7f61c..efcfc2edb 100644 --- a/programs/svm-spoke/src/lib.rs +++ b/programs/svm-spoke/src/lib.rs @@ -14,7 +14,7 @@ security_txt! { auditors: "OpenZeppelin" } -declare_id!("D1WcTLKRyN4TuqnfMBGPvc16nACHfNhFPbgWNExb1aur"); +declare_id!("JAZWcGrpSWNPTBj8QtJ9UyQqhJCDhG9GJkDeMf5NQBiq"); // External programs from idls directory (requires anchor run generateExternalTypes). declare_program!(message_transmitter); From 09cbb64b8b8370e16080acd76e66618a933a0d84 Mon Sep 17 00:00:00 2001 From: Reinis Martinsons Date: Wed, 29 Jan 2025 10:49:43 +0000 Subject: [PATCH 2/4] fix: mainnet deployments Signed-off-by: Reinis Martinsons --- deployments/deployments.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/deployments/deployments.json b/deployments/deployments.json index c9f0390b8..aa2595431 100644 --- a/deployments/deployments.json +++ b/deployments/deployments.json @@ -201,5 +201,23 @@ "address": "CCTPiPYPc6AsJuwueEnWgSgucamXDZwBd53dQ11YiKX3", "blockNumber": 277864039 } + }, + "34268394551451": { + "SvmSpoke": { + "address": "JAZWcGrpSWNPTBj8QtJ9UyQqhJCDhG9GJkDeMf5NQBiq", + "blockNumber": 317101505 + }, + "MulticallHandler": { + "address": "Fk1RpqsfeWt8KnFCTW9NQVdVxYvxuqjGn6iPB9wrmM8h", + "blockNumber": 317112562 + }, + "MessageTransmitter": { + "address": "CCTPmbSD7gX1bxKPAmg77w8oFzNFpaQiQUWD43TKaecd", + "blockNumber": 312515728 + }, + "TokenMessengerMinter": { + "address": "CCTPiPYPc6AsJuwueEnWgSgucamXDZwBd53dQ11YiKX3", + "blockNumber": 262177984 + } } } From 88ac62c015e050853bc9e4ca5cfafa4177b962df Mon Sep 17 00:00:00 2001 From: Reinis Martinsons Date: Wed, 29 Jan 2025 10:59:42 +0000 Subject: [PATCH 3/4] fix: event names in scripts Signed-off-by: Reinis Martinsons --- scripts/svm/closeRelayerPdas.ts | 2 +- scripts/svm/queryDeposits.ts | 2 +- scripts/svm/queryEvents.ts | 4 ++-- scripts/svm/queryFills.ts | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/svm/closeRelayerPdas.ts b/scripts/svm/closeRelayerPdas.ts index d3641dbdb..20ef3e82a 100644 --- a/scripts/svm/closeRelayerPdas.ts +++ b/scripts/svm/closeRelayerPdas.ts @@ -32,7 +32,7 @@ async function closeExpiredRelays(): Promise { try { const events = await readProgramEvents(provider.connection, program); const fillEvents = events.filter( - (event) => event.name === "filledV3Relay" && new PublicKey(event.data.relayer).equals(relayer) + (event) => event.name === "filledRelay" && new PublicKey(event.data.relayer).equals(relayer) ); console.log(`Number of fill events found: ${fillEvents.length}`); diff --git a/scripts/svm/queryDeposits.ts b/scripts/svm/queryDeposits.ts index fdc376c18..fcd909f40 100644 --- a/scripts/svm/queryDeposits.ts +++ b/scripts/svm/queryDeposits.ts @@ -39,7 +39,7 @@ async function queryDeposits(): Promise { try { const events = await readProgramEvents(provider.connection, program); - const depositEvents = events.filter((event) => event.name === "v3FundsDeposited"); + const depositEvents = events.filter((event) => event.name === "fundsDeposited"); if (depositEvents.length === 0) { console.log("No deposit events found for the given seed."); diff --git a/scripts/svm/queryEvents.ts b/scripts/svm/queryEvents.ts index 1b1941deb..b91238c38 100644 --- a/scripts/svm/queryEvents.ts +++ b/scripts/svm/queryEvents.ts @@ -20,8 +20,8 @@ const argvPromise = yargs(hideBin(process.argv)).option("eventName", { describe: "Name of the event to query", choices: [ "any", - "filledV3Relay", - "v3FundsDeposited", + "filledRelay", + "fundsDeposited", "enabledDepositRoute", "relayedRootBundle", "executedRelayerRefundRoot", diff --git a/scripts/svm/queryFills.ts b/scripts/svm/queryFills.ts index de7c7463c..2241104d9 100644 --- a/scripts/svm/queryFills.ts +++ b/scripts/svm/queryFills.ts @@ -38,7 +38,7 @@ async function queryFills(): Promise { try { const events = await readProgramEvents(provider.connection, program); - const fillEvents = events.filter((event) => event.name === "filledV3Relay"); + const fillEvents = events.filter((event) => event.name === "filledRelay"); if (fillEvents.length === 0) { console.log("No fill events found for the given seed."); From fe327b905fadb692df36afb8f7a4196330203e6a Mon Sep 17 00:00:00 2001 From: Pablo Maldonado Date: Wed, 5 Mar 2025 13:39:05 +0100 Subject: [PATCH 4/4] feat: add programs.mainnet Signed-off-by: Pablo Maldonado --- Anchor.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Anchor.toml b/Anchor.toml index aa2cfd968..ab9bfbcd8 100644 --- a/Anchor.toml +++ b/Anchor.toml @@ -13,6 +13,10 @@ test = "8tsEfDSiE4WUMf97oyyyasLAvWwjeRZb2GByh4w7HckA" multicall_handler = "Fk1RpqsfeWt8KnFCTW9NQVdVxYvxuqjGn6iPB9wrmM8h" svm_spoke = "JAZWcGrpSWNPTBj8QtJ9UyQqhJCDhG9GJkDeMf5NQBiq" +[programs.mainnet] +multicall_handler = "Fk1RpqsfeWt8KnFCTW9NQVdVxYvxuqjGn6iPB9wrmM8h" +svm_spoke = "JAZWcGrpSWNPTBj8QtJ9UyQqhJCDhG9GJkDeMf5NQBiq" + [registry] url = "https://api.apr.dev"