Skip to content

fix: new svm program ids #1011

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

fix: new svm program ids #1011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
37a4440
fix: new svm program ids
Reinis-FRP May 30, 2025
da61f1f
fix: update localnet ids
Reinis-FRP May 30, 2025
6a726b7
fix: readme
Reinis-FRP May 30, 2025
e380d6b
fix: redeploy svm mainnet
Reinis-FRP May 30, 2025
3685d22
fix: redeploy solana adapter
Reinis-FRP May 30, 2025
6f2fcc5
fix: trigger ci
Reinis-FRP May 30, 2025
997fad4
fix: bump version
Reinis-FRP May 30, 2025
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
8 changes: 4 additions & 4 deletions Anchor.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ resolution = true
skip-lint = false

[programs.localnet]
multicall_handler = "Fk1RpqsfeWt8KnFCTW9NQVdVxYvxuqjGn6iPB9wrmM8h"
svm_spoke = "JAZWcGrpSWNPTBj8QtJ9UyQqhJCDhG9GJkDeMf5NQBiq"
multicall_handler = "HaQe51FWtnmaEcuYEfPA7MRCXKrtqptat4oJdJ8zV5Be"
svm_spoke = "DLv3NggMiSaef97YCkew5xKUHDh13tVGZ7tydt3ZeAru"
test = "8tsEfDSiE4WUMf97oyyyasLAvWwjeRZb2GByh4w7HckA"

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

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

[registry]
url = "https://api.apr.dev"
Expand Down
8 changes: 6 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 \
Expand Down
10 changes: 5 additions & 5 deletions deployments/deployments.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"Cher_Adapter": { "address": "0x0c9d064523177dBB55CFE52b9D0c485FBFc35FD2", "blockNumber": 21597341 },
"Lens_Adapter": { "address": "0x63AC22131eD457aeCbD63e6c4C7eeC7BBC74fF1F", "blockNumber": 22167069 },
"DoctorWho_Adapter": { "address": "0xFADcC43096756e1527306FD92982FEbBe3c629Fa", "blockNumber": 21773451 },
"Solana_Adapter": { "address": "0x1E22A3146439C68A2d247448372AcAEe9E201AB1", "blockNumber": 22566473 }
"Solana_Adapter": { "address": "0x9F788694934fD2Ed34D5340B9a76EB34f2bFD7B3", "blockNumber": 22595936 }
},
"10": {
"SpokePool": { "address": "0x6f26Bf09B1C792e3228e5467807a900A503c0281", "blockNumber": 93903076 },
Expand Down Expand Up @@ -226,12 +226,12 @@
},
"34268394551451": {
"SvmSpoke": {
"address": "JAZWcGrpSWNPTBj8QtJ9UyQqhJCDhG9GJkDeMf5NQBiq",
"blockNumber": 317101505
"address": "DLv3NggMiSaef97YCkew5xKUHDh13tVGZ7tydt3ZeAru",
"blockNumber": 343455088
},
"MulticallHandler": {
"address": "Fk1RpqsfeWt8KnFCTW9NQVdVxYvxuqjGn6iPB9wrmM8h",
"blockNumber": 317112562
"address": "HaQe51FWtnmaEcuYEfPA7MRCXKrtqptat4oJdJ8zV5Be",
"blockNumber": 343468675
},
"MessageTransmitter": {
"address": "CCTPmbSD7gX1bxKPAmg77w8oFzNFpaQiQUWD43TKaecd",
Expand Down
20 changes: 10 additions & 10 deletions deployments/mainnet/Solana_Adapter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"address": "0x1E22A3146439C68A2d247448372AcAEe9E201AB1",
"address": "0x9F788694934fD2Ed34D5340B9a76EB34f2bFD7B3",
"abi": [
{
"inputs": [
Expand Down Expand Up @@ -328,29 +328,29 @@
"type": "function"
}
],
"transactionHash": "0x940c1e4bf26e94e657bc1e1344d3c2aea44e80a051837b75812283668a23c3a7",
"transactionHash": "0x5256d567a2ce4cbc96f04cb3b0885fad53fd48d163b67a79d9dfeaaba21f6fc3",
"receipt": {
"to": null,
"from": "0x9A8f92a830A5cB89a3816e3D267CB7791c16b04D",
"contractAddress": "0x1E22A3146439C68A2d247448372AcAEe9E201AB1",
"transactionIndex": 72,
"contractAddress": "0x9F788694934fD2Ed34D5340B9a76EB34f2bFD7B3",
"transactionIndex": 22,
"gasUsed": "1034334",
"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"blockHash": "0x66dae79469e26570eb7960c9b1daa884ca592e1085f00879f1012d1e5e309022",
"transactionHash": "0x940c1e4bf26e94e657bc1e1344d3c2aea44e80a051837b75812283668a23c3a7",
"blockHash": "0x60c1b45973d5aba6a92d540aa1c8b879817b8a1a3cafcb9b20ce4ba474c44dd1",
"transactionHash": "0x5256d567a2ce4cbc96f04cb3b0885fad53fd48d163b67a79d9dfeaaba21f6fc3",
"logs": [],
"blockNumber": 22566473,
"cumulativeGasUsed": "5278156",
"blockNumber": 22595936,
"cumulativeGasUsed": "4109786",
"status": 1,
"byzantium": true
},
"args": [
"0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
"0xBd3fa81B58Ba92a82136038B25aDec7066af3155",
"0x0a992d191deec32afe36203ad87d7d289a738f81",
"0xff09aa2d3eb1bc9da19e82264930e13d3993e1160f3039ef21afd1565376efca",
"0xb7664086de37ee70821c10445b162f2c7ec8795bd0800c1462949e2328d1dd5a",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

decodes to svm_spoke at DLv3NggMiSaef97YCkew5xKUHDh13tVGZ7tydt3ZeAru

"0xc6fa7af3bedbad3a3d65f36aabc97431b1bbe4c2d2f6e0e47ca60203452f5d61",
"0xe11ef405ee6e9a6497fb8209d04040216281c57264730415648de979f6cec7fa"
"0xf5d9ddc2b5d994277e15ea380117a3f8ef04ce1e37e2c678c3be4d11b2a5d034"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

decodes to USDC vault for the new svm_spoke at HYhZwefNFmEm9sXYKkNM4QPMgGQnS9VjC6kgxwrGk3Ru

],
"numDeployments": 1,
"solcInputHash": "335735b51fb84a31677c4bf77e2b5d68",
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@across-protocol/contracts",
"version": "4.0.12",
"version": "4.0.13",
"author": "UMA Team",
"license": "AGPL-3.0-only",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion programs/multicall-handler/src/lib.rs
View file
Open in desktop
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!("Fk1RpqsfeWt8KnFCTW9NQVdVxYvxuqjGn6iPB9wrmM8h");
declare_id!("HaQe51FWtnmaEcuYEfPA7MRCXKrtqptat4oJdJ8zV5Be");
Copy link
Contributor Author

Choose a reason for hiding this comment

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

verified this has the highest bump:

$ solana find-program-derived-address HaQe51FWtnmaEcuYEfPA7MRCXKrtqptat4oJdJ8zV5Be string:handler_signer --output json
{
  "address": "FDF3RHJbQmN4usz13Z1rcHDFMoTwNN4VebhgjCeNfntH",
  "bumpSeed": 255
}


#[program]
pub mod multicall_handler {
Expand Down
2 changes: 1 addition & 1 deletion programs/svm-spoke/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ security_txt! {
auditors: "OpenZeppelin"
}

declare_id!("JAZWcGrpSWNPTBj8QtJ9UyQqhJCDhG9GJkDeMf5NQBiq");
declare_id!("DLv3NggMiSaef97YCkew5xKUHDh13tVGZ7tydt3ZeAru");

// External programs from idls directory (requires anchor run generateExternalTypes).
declare_program!(message_transmitter);
Expand Down
Loading