Skip to content

Commit e0a3b0b

Browse files
fusmaniifusmanii
committed
Merge branch 'master' of github.com:across-protocol/contracts into faisal/foundry-typechain
2 parents b99d6c0 + 5b6f342 commit e0a3b0b

File tree

68 files changed

+418
-15436
lines changed

Some content is hidden

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

68 files changed

+418
-15436
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,6 @@ test-ledger
5252
src/svm/assets
5353
src/svm/clients/*
5454
!src/svm/clients/index.ts
55+
56+
# Claude
57+
.claude

‎broadcast/047DeployRedstoneSpokePool.s.sol/690/run-latest.json‎

Lines changed: 0 additions & 70 deletions
This file was deleted.

‎broadcast/deployed-addresses.json‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,6 @@
131131
"address": "0xE5Dea263511F5caC27b15cBd58Ff103F4Ce90957",
132132
"block_number": 20378872
133133
},
134-
"Redstone_Adapter": {
135-
"address": "0x188F8C95B7cfB7993B53a4F643efa687916f73fA",
136-
"block_number": 20432774
137-
},
138134
"Zora_Adapter": {
139135
"address": "0x024f2fc31cbdd8de17194b1892c834f98ef5169b",
140136
"block_number": 20512287
@@ -143,10 +139,6 @@
143139
"address": "0xA8399e221a583A57F54Abb5bA22f31b5D6C09f32",
144140
"block_number": 20963234
145141
},
146-
"AlephZero_Adapter": {
147-
"address": "0x6F4083304C2cA99B077ACE06a5DcF670615915Af",
148-
"block_number": 21131132
149-
},
150142
"Ink_Adapter": {
151143
"address": "0x7e90a40c7519b041a7df6498fbf5662e8cfc61d2",
152144
"block_number": 21438590
@@ -476,32 +468,6 @@
476468
}
477469
}
478470
},
479-
"690": {
480-
"chain_name": "Redstone",
481-
"contracts": {
482-
"SpokePool": {
483-
"address": "0x13fDac9F9b4777705db45291bbFF3c972c6d1d97",
484-
"block_number": 5512122
485-
},
486-
"SpokePoolVerifier": {
487-
"address": "0x3Fb9cED51E968594C87963a371Ed90c39519f65A",
488-
"block_number": 17147100
489-
},
490-
"MulticallHandler": {
491-
"address": "0x0F7Ae28dE1C8532170AD4ee566B5801485c13a0E",
492-
"block_number": 20457079
493-
},
494-
"SpokePoolPeriphery": {
495-
"address": "0x89415a82d909a7238d69094C3Dd1dCC1aCbDa85C",
496-
"block_number": 16783149
497-
},
498-
"Redstone_SpokePool": {
499-
"address": "0x78d8cb7284b14c123a2e81a3246494e8dad873e4",
500-
"block_number": 21978768,
501-
"transaction_hash": "0xa57c46d87a2f441460948eee80f1301db9881360e82158d1dae50e73f3d32166"
502-
}
503-
}
504-
},
505471
"919": {
506472
"chain_name": "Mode Sepolia",
507473
"contracts": {

‎broadcast/deployed-addresses.md‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ This file contains the latest deployed smart contract addresses from the broadca
99
| AcrossConfigStore | [0x3B03509645713718B78951126E0A6de6f10043f5](https://etherscan.io/address/0x3B03509645713718B78951126E0A6de6f10043f5) |
1010
| AcrossMerkleDistributor | [0xE50b2cEAC4f60E840Ae513924033E753e2366487](https://etherscan.io/address/0xE50b2cEAC4f60E840Ae513924033E753e2366487) |
1111
| AdapterStore | [0x42df4D71f35ffBD28ae217d52E83C1DA0007D63b](https://etherscan.io/address/0x42df4D71f35ffBD28ae217d52E83C1DA0007D63b) |
12-
| AlephZero_Adapter | [0x6F4083304C2cA99B077ACE06a5DcF670615915Af](https://etherscan.io/address/0x6F4083304C2cA99B077ACE06a5DcF670615915Af) |
1312
| Arbitrum_Adapter | [0x5eC9844936875E27eBF22172f4d92E107D35B57C](https://etherscan.io/address/0x5eC9844936875E27eBF22172f4d92E107D35B57C) |
1413
| Arbitrum_Adapter | [0xc0b6d2f794cc787C71f2cA5ceCD57102C32379B3](https://etherscan.io/address/0xc0b6d2f794cc787C71f2cA5ceCD57102C32379B3) |
1514
| Arbitrum_RescueAdapter | [0xC6fA0a4EBd802c01157d6E7fB1bbd2ae196ae375](https://etherscan.io/address/0xC6fA0a4EBd802c01157d6E7fB1bbd2ae196ae375) |
@@ -42,7 +41,6 @@ This file contains the latest deployed smart contract addresses from the broadca
4241
| Polygon_Adapter | [0xF71F1e20F75820b484F8A0959C2D9E5cdd89c9F0](https://etherscan.io/address/0xF71F1e20F75820b484F8A0959C2D9E5cdd89c9F0) |
4342
| Polygon_Adapter | [0x537abE038C223066B50312474409924487D2E655](https://etherscan.io/address/0x537abE038C223066B50312474409924487D2E655) |
4443
| PolygonTokenBridger | [0x0330E9b4D0325cCfF515E81DFbc7754F2a02ac57](https://etherscan.io/address/0x0330E9b4D0325cCfF515E81DFbc7754F2a02ac57) |
45-
| Redstone_Adapter | [0x188F8C95B7cfB7993B53a4F643efa687916f73fA](https://etherscan.io/address/0x188F8C95B7cfB7993B53a4F643efa687916f73fA) |
4644
| Scroll_Adapter | [0x2DA799c2223c6ffB595e578903AE6b95839160d8](https://etherscan.io/address/0x2DA799c2223c6ffB595e578903AE6b95839160d8) |
4745
| Solana_Adapter | [0x9F788694934fD2Ed34D5340B9a76EB34f2bFD7B3](https://etherscan.io/address/0x9F788694934fD2Ed34D5340B9a76EB34f2bFD7B3) |
4846
| SpokePool | [0x5c7BCd6E7De5423a257D81B442095A1a6ced35C5](https://etherscan.io/address/0x5c7BCd6E7De5423a257D81B442095A1a6ced35C5) |
@@ -158,16 +156,6 @@ This file contains the latest deployed smart contract addresses from the broadca
158156
| SpokePoolVerifier | [0x3Fb9cED51E968594C87963a371Ed90c39519f65A](https://worldchain-mainnet-explorer.alchemy.com/address/0x3Fb9cED51E968594C87963a371Ed90c39519f65A) |
159157
| SponsoredCCTPSrcPeriphery | [0x1c8243198570658f818FC56538f2c837C2a32958](https://worldchain-mainnet-explorer.alchemy.com/address/0x1c8243198570658f818FC56538f2c837C2a32958) |
160158

161-
## Redstone (690)
162-
163-
| Contract Name | Address |
164-
| ------------------ | ------------------------------------------------------------------------------------------------------------------------------ |
165-
| MulticallHandler | [0x0F7Ae28dE1C8532170AD4ee566B5801485c13a0E](https://explorer.redstone.xyz/address/0x0F7Ae28dE1C8532170AD4ee566B5801485c13a0E) |
166-
| Redstone_SpokePool | [0x78D8CB7284B14c123a2e81A3246494e8DAd873E4](https://explorer.redstone.xyz/address/0x78D8CB7284B14c123a2e81A3246494e8DAd873E4) |
167-
| SpokePool | [0x13fDac9F9b4777705db45291bbFF3c972c6d1d97](https://explorer.redstone.xyz/address/0x13fDac9F9b4777705db45291bbFF3c972c6d1d97) |
168-
| SpokePoolPeriphery | [0x89415a82d909a7238d69094C3Dd1dCC1aCbDa85C](https://explorer.redstone.xyz/address/0x89415a82d909a7238d69094C3Dd1dCC1aCbDa85C) |
169-
| SpokePoolVerifier | [0x3Fb9cED51E968594C87963a371Ed90c39519f65A](https://explorer.redstone.xyz/address/0x3Fb9cED51E968594C87963a371Ed90c39519f65A) |
170-
171159
## HyperEVM (999)
172160

173161
| Contract Name | Address |

‎contracts/AlephZero_SpokePool.sol‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎contracts/chain-adapters/Redstone_Adapter.sol‎

Lines changed: 0 additions & 95 deletions
This file was deleted.

‎deploy/046_deploy_redstone_adapter.ts‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎deploy/053_deploy_alephzero_adapter.ts‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎deploy/consts.ts‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,12 @@ export const USDC = TOKEN_SYMBOLS_MAP.USDC.addresses;
77
export const USDCe = TOKEN_SYMBOLS_MAP["USDC.e"].addresses;
88
export const WETH = TOKEN_SYMBOLS_MAP.WETH.addresses;
99
export const WMATIC = TOKEN_SYMBOLS_MAP.WMATIC.addresses;
10-
export const WAZERO = TOKEN_SYMBOLS_MAP.WAZERO.addresses;
11-
export const AZERO = TOKEN_SYMBOLS_MAP.AZERO;
1210
export const WGRASS = TOKEN_SYMBOLS_MAP.WGRASS.addresses;
1311
export const WGHO = TOKEN_SYMBOLS_MAP.WGHO.addresses;
1412

1513
export const QUOTE_TIME_BUFFER = 3600;
1614
export const FILL_DEADLINE_BUFFER = 6 * 3600;
1715
export const ARBITRUM_MAX_SUBMISSION_COST = "10000000000000000";
18-
export const AZERO_GAS_PRICE = "240000000000";
1916
export const CIRCLE_UNINITIALIZED_DOMAIN_ID = 4294967295; // 2^32 - 1
2017

2118
export const ZK_L1_GAS_TO_L2_GAS_PER_PUBDATA_LIMIT = 800;
@@ -52,8 +49,6 @@ export const L1_ADDRESS_MAP: { [key: number]: { [contractName: string]: string }
5249
scrollGasPriceOracle: "0x56971da63A3C0205184FEF096E9ddFc7A8C2D18a",
5350
blastYieldManager: "0xa230285d5683C74935aD14c446e137c8c8828438",
5451
blastDaiRetriever: "0x98Dd57048d7d5337e92D9102743528ea4Fea64aB",
55-
l1AlephZeroInbox: "0x56D8EC76a421063e1907503aDd3794c395256AEb",
56-
l1AlephZeroERC20GatewayRouter: "0xeBb17f398ed30d02F2e8733e7c1e5cf566e17812",
5752
donationBox: "0x0d57392895Db5aF3280e9223323e20F3951E81B1",
5853
adapterStore: "0x42df4D71f35ffBD28ae217d52E83C1DA0007D63b",
5954
hubPoolStore: "0x1Ace3BbD69b63063F859514Eca29C9BDd8310E61",
@@ -134,10 +129,6 @@ export const OP_STACK_ADDRESS_MAP: {
134129
L1CrossDomainMessenger: "0x25ace71c97B33Cc4729CF772ae268934F7ab5fA1", // Source: https://github.com/ethereum-optimism/optimism/tree/develop/packages/contracts/deployments
135130
L1StandardBridge: "0x99C9fc46f92E8a1c0deC1b1747d010903E884bE1",
136131
},
137-
[CHAIN_IDs.REDSTONE]: {
138-
L1CrossDomainMessenger: "0x592C1299e0F8331D81A28C0FC7352Da24eDB444a",
139-
L1StandardBridge: "0xc473ca7E02af24c129c2eEf51F2aDf0411c1Df69",
140-
},
141132
[CHAIN_IDs.SONEIUM]: {
142133
L1CrossDomainMessenger: "0x9cf951e3f74b644e621b36ca9cea147a78d4c39f",
143134
L1StandardBridge: "0xeb9bf100225c214efc3e7c651ebbadcf85177607",
@@ -183,9 +174,6 @@ export const OP_STACK_ADDRESS_MAP: {
183174
};
184175

185176
export const L2_ADDRESS_MAP: { [key: number]: { [contractName: string]: string } } = {
186-
[CHAIN_IDs.ALEPH_ZERO]: {
187-
l2GatewayRouter: "0xD296d45171B97720D3aBdb68B0232be01F1A9216",
188-
},
189177
[CHAIN_IDs.ARBITRUM_SEPOLIA]: {
190178
l2GatewayRouter: "0x9fDD1C4E4AA24EEc1d913FABea925594a20d43C7",
191179
cctpTokenMessenger: "0x9f3B8679c73C2Fef8b59B4f3444d4e156fb70AA5",
@@ -328,10 +316,6 @@ export const L2_ADDRESS_MAP: { [key: number]: { [contractName: string]: string }
328316
[CHAIN_IDs.LISK]: {
329317
permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3",
330318
},
331-
[CHAIN_IDs.REDSTONE]: {
332-
cctpV2TokenMessenger: "0x0000000000000000000000000000000000000000",
333-
permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3",
334-
},
335319
[CHAIN_IDs.MODE]: {
336320
cctpV2TokenMessenger: "0x0000000000000000000000000000000000000000",
337321
permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3",

‎deployments/README.md‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ This is because this `deployments.json` file is used by bots in [`@across-protoc
2525
| Lisk Adapter | [0x8229E812f20537caA1e8Fb41749b4887B8a75C3B](https://etherscan.io/address/0x8229E812f20537caA1e8Fb41749b4887B8a75C3B) |
2626
| Blast Adapter | [0xF2bEf5E905AAE0295003ab14872F811E914EdD81](https://etherscan.io/address/0xF2bEf5E905AAE0295003ab14872F811E914EdD81) |
2727
| Scroll Adapter | [0xb6129Ab69aEA75e6884c2D6ecf25293C343C519F](https://etherscan.io/address/0xb6129Ab69aEA75e6884c2D6ecf25293C343C519F) |
28-
| Redstone Adapter | [0x188F8C95B7cfB7993B53a4F643efa687916f73fA](https://etherscan.io/address/0x188F8C95B7cfB7993B53a4F643efa687916f73fA) |
2928
| Zora Adapter | [0x024F2fC31CBDD8de17194b1892c834f98Ef5169b](https://etherscan.io/address/0x024F2fC31CBDD8de17194b1892c834f98Ef5169b) |
3029
| WorldChain Adapter | [0x8eBebfc894047bEE213A561b8792fCa71241731f](https://etherscan.io/address/0x8eBebfc894047bEE213A561b8792fCa71241731f) |
3130
| AcrossConfigStore | [0x3B03509645713718B78951126E0A6de6f10043f5](https://etherscan.io/address/0x3B03509645713718B78951126E0A6de6f10043f5) |
@@ -97,13 +96,6 @@ This is because this `deployments.json` file is used by bots in [`@across-protoc
9796
| Blast_SpokePool | [0x2D509190Ed0172ba588407D4c2df918F955Cc6E1](https://blastscan.io/address/0x2D509190Ed0172ba588407D4c2df918F955Cc6E1) |
9897
| MulticallHandler | [0x924a9f036260DdD5808007E1AA95f08eD08aA569](https://blastscan.io/address/0x924a9f036260DdD5808007E1AA95f08eD08aA569) |
9998

100-
## Redstone mainnet (690)
101-
102-
| Contract Name | Address |
103-
| ------------------ | ------------------------------------------------------------------------------------------------------------------------------ |
104-
| Redstone_SpokePool | [0x13fDac9F9b4777705db45291bbFF3c972c6d1d97](https://explorer.redstone.xyz/address/0x13fDac9F9b4777705db45291bbFF3c972c6d1d97) |
105-
| MulticallHandler | [0x924a9f036260DdD5808007E1AA95f08eD08aA569](https://explorer.redstone.xyz/address/0x924a9f036260DdD5808007E1AA95f08eD08aA569) |
106-
10799
## Scroll mainnet (534352)
108100

109101
| Contract Name | Address |

0 commit comments

Comments
 (0)