Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions Anchor.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@ resolution = true
skip-lint = false

[programs.localnet]
multicall_handler = "27dua7HMuaZrAc6PRfxmvshHChypFLzZVSpKKaDAPjsq"
svm_spoke = "D1WcTLKRyN4TuqnfMBGPvc16nACHfNhFPbgWNExb1aur"
multicall_handler = "Fk1RpqsfeWt8KnFCTW9NQVdVxYvxuqjGn6iPB9wrmM8h"
svm_spoke = "JAZWcGrpSWNPTBj8QtJ9UyQqhJCDhG9GJkDeMf5NQBiq"
test = "8tsEfDSiE4WUMf97oyyyasLAvWwjeRZb2GByh4w7HckA"

[programs.devnet]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shall we also add them for mainnet now?

multicall_handler = "27dua7HMuaZrAc6PRfxmvshHChypFLzZVSpKKaDAPjsq"
svm_spoke = "D1WcTLKRyN4TuqnfMBGPvc16nACHfNhFPbgWNExb1aur"
multicall_handler = "Fk1RpqsfeWt8KnFCTW9NQVdVxYvxuqjGn6iPB9wrmM8h"
svm_spoke = "JAZWcGrpSWNPTBj8QtJ9UyQqhJCDhG9GJkDeMf5NQBiq"

[programs.mainnet]
multicall_handler = "Fk1RpqsfeWt8KnFCTW9NQVdVxYvxuqjGn6iPB9wrmM8h"
svm_spoke = "JAZWcGrpSWNPTBj8QtJ9UyQqhJCDhG9GJkDeMf5NQBiq"

[registry]
url = "https://api.apr.dev"
Expand Down
18 changes: 18 additions & 0 deletions deployments/deployments.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
2 changes: 1 addition & 1 deletion programs/multicall-handler/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion programs/svm-spoke/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion scripts/svm/closeRelayerPdas.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ async function closeExpiredRelays(): Promise<void> {
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}`);
Expand Down
2 changes: 1 addition & 1 deletion scripts/svm/queryDeposits.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ async function queryDeposits(): Promise<void> {

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.");
Expand Down
4 changes: 2 additions & 2 deletions scripts/svm/queryEvents.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion scripts/svm/queryFills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ async function queryFills(): Promise<void> {

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.");
Expand Down
Loading