diff --git a/Anchor.toml b/Anchor.toml index 4557fd21e..05b1e7451 100644 --- a/Anchor.toml +++ b/Anchor.toml @@ -6,16 +6,16 @@ skip-lint = false [programs.localnet] multicall_handler = "Fk1RpqsfeWt8KnFCTW9NQVdVxYvxuqjGn6iPB9wrmM8h" -svm_spoke = "JAZWcGrpSWNPTBj8QtJ9UyQqhJCDhG9GJkDeMf5NQBiq" +svm_spoke = "4Jg83Lhggz2EdzSsDX2NVcEK56F25jJKK5btUbHAU4Xu" test = "8tsEfDSiE4WUMf97oyyyasLAvWwjeRZb2GByh4w7HckA" [programs.devnet] multicall_handler = "Fk1RpqsfeWt8KnFCTW9NQVdVxYvxuqjGn6iPB9wrmM8h" -svm_spoke = "JAZWcGrpSWNPTBj8QtJ9UyQqhJCDhG9GJkDeMf5NQBiq" +svm_spoke = "4Jg83Lhggz2EdzSsDX2NVcEK56F25jJKK5btUbHAU4Xu" [programs.mainnet] multicall_handler = "Fk1RpqsfeWt8KnFCTW9NQVdVxYvxuqjGn6iPB9wrmM8h" -svm_spoke = "JAZWcGrpSWNPTBj8QtJ9UyQqhJCDhG9GJkDeMf5NQBiq" +svm_spoke = "4Jg83Lhggz2EdzSsDX2NVcEK56F25jJKK5btUbHAU4Xu" [registry] url = "https://api.apr.dev" diff --git a/README.md b/README.md index d8214d2e8..581e72a7d 100644 --- a/README.md +++ b/README.md @@ -95,6 +95,7 @@ export SVM_CHAIN_ID=$(cast to-dec $(cast shr $(cast shl $(cast keccak solana-dev export HUB_POOL=0x14224e63716afAcE30C9a417E0542281869f7d9e # This is for sepolia, update for mainnet export DEPOSIT_QUOTE_TIME_BUFFER=3600 export FILL_DEADLINE_BUFFER=21600 +export MAX_LEN=$(( 2 * $(stat -c %s target/deploy/$PROGRAM.so) )) # Reserve twice the size of the program for future upgrades ``` #### Initial deployment @@ -103,11 +104,14 @@ Deploy the program and set the upgrade authority to the multisig: ```shell solana program deploy \ - --url $RPC_URL target/deploy/$PROGRAM.so \ + --url $RPC_URL \ --keypair $KEYPAIR \ --program-id target/deploy/$PROGRAM-keypair.json \ + --max-len $MAX_LEN \ --with-compute-unit-price 50000 \ - --max-sign-attempts 100 + --max-sign-attempts 100 \ + --use-rpc \ + target/deploy/$PROGRAM.so solana program set-upgrade-authority \ --url $RPC_URL \ --keypair $KEYPAIR \ diff --git a/deployments/deployments.json b/deployments/deployments.json index e3dd2ac62..8d8177c36 100644 --- a/deployments/deployments.json +++ b/deployments/deployments.json @@ -208,8 +208,8 @@ }, "133268194659241": { "SvmSpoke": { - "address": "JAZWcGrpSWNPTBj8QtJ9UyQqhJCDhG9GJkDeMf5NQBiq", - "blockNumber": 356313770 + "address": "4Jg83Lhggz2EdzSsDX2NVcEK56F25jJKK5btUbHAU4Xu", + "blockNumber": 388467389 }, "MulticallHandler": { "address": "Fk1RpqsfeWt8KnFCTW9NQVdVxYvxuqjGn6iPB9wrmM8h", @@ -226,8 +226,8 @@ }, "34268394551451": { "SvmSpoke": { - "address": "JAZWcGrpSWNPTBj8QtJ9UyQqhJCDhG9GJkDeMf5NQBiq", - "blockNumber": 317101505 + "address": "4Jg83Lhggz2EdzSsDX2NVcEK56F25jJKK5btUbHAU4Xu", + "blockNumber": 347611576 }, "MulticallHandler": { "address": "Fk1RpqsfeWt8KnFCTW9NQVdVxYvxuqjGn6iPB9wrmM8h", diff --git a/package.json b/package.json index db6897370..0e21ceb80 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@across-protocol/contracts", - "version": "4.0.12", + "version": "4.0.14-alpha.1", "author": "UMA Team", "license": "AGPL-3.0-only", "repository": { diff --git a/programs/svm-spoke/src/lib.rs b/programs/svm-spoke/src/lib.rs index 4a6c7ad95..a082ea627 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!("JAZWcGrpSWNPTBj8QtJ9UyQqhJCDhG9GJkDeMf5NQBiq"); +declare_id!("4Jg83Lhggz2EdzSsDX2NVcEK56F25jJKK5btUbHAU4Xu"); // External programs from idls directory (requires anchor run generateExternalTypes). declare_program!(message_transmitter);