Skip to content

Commit 3bacb72

Browse files
committed
Merge branch 'master' of github.com:across-protocol/contracts into faisal/foundry-typechain
2 parents 798b46d + 78dad2e commit 3bacb72

File tree

72 files changed

+5882
-495
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+5882
-495
lines changed

Anchor.toml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,17 @@ skip-lint = false
88
multicall_handler = "HaQe51FWtnmaEcuYEfPA7MRCXKrtqptat4oJdJ8zV5Be"
99
svm_spoke = "DLv3NggMiSaef97YCkew5xKUHDh13tVGZ7tydt3ZeAru"
1010
test = "8tsEfDSiE4WUMf97oyyyasLAvWwjeRZb2GByh4w7HckA"
11+
sponsored_cctp_src_periphery = "CPr4bRvkVKcSCLyrQpkZrRrwGzQeVAXutFU8WupuBLXq"
1112

1213
[programs.devnet]
1314
multicall_handler = "Fk1RpqsfeWt8KnFCTW9NQVdVxYvxuqjGn6iPB9wrmM8h"
1415
svm_spoke = "JAZWcGrpSWNPTBj8QtJ9UyQqhJCDhG9GJkDeMf5NQBiq"
16+
sponsored_cctp_src_periphery = "CPr4bRvkVKcSCLyrQpkZrRrwGzQeVAXutFU8WupuBLXq"
1517

1618
[programs.mainnet]
1719
multicall_handler = "HaQe51FWtnmaEcuYEfPA7MRCXKrtqptat4oJdJ8zV5Be"
1820
svm_spoke = "DLv3NggMiSaef97YCkew5xKUHDh13tVGZ7tydt3ZeAru"
21+
sponsored_cctp_src_periphery = "CPr4bRvkVKcSCLyrQpkZrRrwGzQeVAXutFU8WupuBLXq"
1922

2023
[registry]
2124
url = "https://api.apr.dev"
@@ -25,6 +28,7 @@ cluster = "localnet"
2528
wallet = "test/svm/keys/localnet-wallet.json"
2629

2730
[scripts]
31+
### SvmSpoke scripts:
2832
test = "anchor run generateExternalTypes && yarn run ts-mocha -p ./tsconfig.json -t 1000000 test/svm/**/*.ts"
2933
queryEvents = "NODE_NO_WARNINGS=1 yarn run ts-node ./scripts/svm/queryEvents.ts"
3034
queryEventsV2 = "NODE_NO_WARNINGS=1 yarn run ts-node ./scripts/svm/queryEventsV2.ts"
@@ -56,6 +60,23 @@ findFillStatusFromFillStatusPda = "NODE_NO_WARNINGS=1 yarn run ts-node ./scripts
5660
nativeDeposit = "NODE_NO_WARNINGS=1 yarn run ts-node ./scripts/svm/nativeDeposit.ts"
5761
squadsIdlUpgrade = "NODE_NO_WARNINGS=1 yarn run ts-node ./scripts/svm/squadsIdlUpgrade.ts"
5862

63+
### SponsoredCctpSrc scripts:
64+
initializeSponsoredCctpSrc = "NODE_NO_WARNINGS=1 yarn run ts-node ./scripts/svm/SponsoredCctpSrc/initialize.ts"
65+
setSignerSponsoredCctpSrc = "NODE_NO_WARNINGS=1 yarn run ts-node ./scripts/svm/SponsoredCctpSrc/setSigner.ts"
66+
setMinimumDepositSponsoredCctpSrc = "NODE_NO_WARNINGS=1 yarn run ts-node ./scripts/svm/SponsoredCctpSrc/setMinimumDeposit.ts"
67+
withdrawRentFundSponsoredCctpSrc = "NODE_NO_WARNINGS=1 yarn run ts-node ./scripts/svm/SponsoredCctpSrc/withdrawRentFund.ts"
68+
depositRentFundSponsoredCctpSrc = "NODE_NO_WARNINGS=1 yarn run ts-node ./scripts/svm/SponsoredCctpSrc/depositRentFund.ts"
69+
setupLookupTableSponsoredCctpSrc = "NODE_NO_WARNINGS=1 yarn run ts-node ./scripts/svm/SponsoredCctpSrc/setupLookupTable.ts"
70+
depositForBurnSponsoredCctpSrc = "NODE_NO_WARNINGS=1 yarn run ts-node ./scripts/svm/SponsoredCctpSrc/depositForBurn.ts"
71+
queryDepositsSponsoredCctpSrc = "NODE_NO_WARNINGS=1 yarn run ts-node ./scripts/svm/SponsoredCctpSrc/queryDeposits.ts"
72+
reclaimUsedNonceAccountsSponsoredCctpSrc = "NODE_NO_WARNINGS=1 yarn run ts-node ./scripts/svm/SponsoredCctpSrc/reclaimUsedNonceAccounts.ts"
73+
reclaimEventAccountsSponsoredCctpSrc = "NODE_NO_WARNINGS=1 yarn run ts-node ./scripts/svm/SponsoredCctpSrc/reclaimEventAccounts.ts"
74+
receiveMessageSponsoredCctpSrc = "NODE_NO_WARNINGS=1 yarn run ts-node ./scripts/svm/SponsoredCctpSrc/receiveMessage.ts"
75+
repayRentFundDebtSponsoredCctpSrc = "NODE_NO_WARNINGS=1 yarn run ts-node ./scripts/svm/SponsoredCctpSrc/repayRentFundDebt.ts"
76+
77+
[test]
78+
upgradeable = true
79+
5980
[test.validator]
6081
url = "https://api.mainnet-beta.solana.com"
6182

@@ -84,3 +105,28 @@ address = "Afgq3BHEfCE7d78D2XE9Bfyu2ieDqvE24xX8KDwreBms"
84105
### Circle Token Messenger Minter PDA -- Ethereum Remote Token Messenger
85106
[[test.validator.clone]]
86107
address = "Hazwi3jFQtLKc2ughi7HFXPkpDeso7DQaMR9Ks4afh3j"
108+
109+
### Forked Circle MessageTransmitterV2 Program
110+
[[test.validator.clone]]
111+
address = "CCTPV2Sm4AdWt5296sk4P66VBZ7bEhcARwFaaS9YPbeC"
112+
113+
### Forked Circle TokenMessengerMinterV2 Program
114+
[[test.validator.clone]]
115+
address = "CCTPV2vPZJS2u2BBsUoscuikbYjnpFmbFsvVuJdgUMQe"
116+
117+
### Forked Circle MessageTransmitterV2 PDA -- Message Transmitter Config
118+
[[test.validator.clone]]
119+
address = "W1k5ijkaSTo5iA5zChNpfzcy796fLhkBxfmJuR8W8HU"
120+
121+
### Forked Circle TokenMessengerMinterV2 PDA -- Token Messenger
122+
[[test.validator.clone]]
123+
address = "AawthJCGRmggpfv9MMWV6Jmo9cue4gL9wUZgRBShg58W"
124+
125+
### Circle TokenMessengerMinterV2 PDA -- Ethereum Remote Token Messenger
126+
[[test.validator.clone]]
127+
address = "3EzN2mcmdfSNGXRCAixSpTteK6ywdmFDZZWvkMnznFt9"
128+
129+
### Circle TokenMessengerMinterV2 PDA -- Token Minter (Modified with token_controller set to test wallet)
130+
[[test.validator.account]]
131+
address = "E1bQJ8eMMn3zmeSewW3HQ8zmJr7KR75JonbwAtWx2bux"
132+
filename = "test/svm/accounts/token_minter_v2.json"

Cargo.lock

Lines changed: 96 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ solana program deploy \
136136
--keypair $KEYPAIR \
137137
--program-id target/deploy/$PROGRAM-keypair.json \
138138
--max-len $MAX_LEN \
139-
--with-compute-unit-price 50000 \
139+
--with-compute-unit-price 100000 \
140140
--max-sign-attempts 100 \
141141
--use-rpc \
142142
target/deploy/$PROGRAM.so
@@ -189,6 +189,22 @@ anchor run createVault \
189189
--originToken $MINT
190190
```
191191

192+
`sponsored_cctp_src_periphery` requires initialization and setting minimum deposit amount for supported burn token:
193+
194+
```shell
195+
# Replace --quoteSigner with actual quote signer address
196+
anchor run initializeSponsoredCctpSrc \
197+
--provider.cluster $RPC_URL \
198+
--provider.wallet $KEYPAIR -- \
199+
--quoteSigner 0x0000000000000000000000000000000000000000
200+
# Below is USDC on devnet, replace --burnToken with mainnet burn token and --amount with required minimum deposit amount (raw value)
201+
anchor run setMinimumDepositSponsoredCctpSrc \
202+
--provider.cluster $RPC_URL \
203+
--provider.wallet $KEYPAIR -- \
204+
--burnToken 4zMMC9srt5Ri5X14GAgXhaHii3GnPAEERYPJgZJDncDU \
205+
--amount 0
206+
```
207+
192208
#### Upgrades
193209

194210
Initiate the program upgrade:
@@ -197,7 +213,7 @@ Initiate the program upgrade:
197213
solana program write-buffer \
198214
--url $RPC_URL \
199215
--keypair $KEYPAIR \
200-
--with-compute-unit-price 50000 \
216+
--with-compute-unit-price 100000 \
201217
--max-sign-attempts 100 \
202218
--use-rpc \
203219
target/deploy/$PROGRAM.so

0 commit comments

Comments
 (0)