From 9b9b3d66b38a7a8f0975aeeb59d35de0640576a1 Mon Sep 17 00:00:00 2001 From: nicholaspai Date: Thu, 13 Jun 2024 14:25:44 -0400 Subject: [PATCH 1/2] fix(BlastAdapter): Bridging DAI uses BlastBridge which doesn't contain depositERC20To Blast Bridge [here](https://etherscan.io/address/0x3a05E5d33d7Ab3864D53aaEc93c8301C1Fa49115#writeProxyContract) contains a `bridgeERC20To` but not a `depositERC20To` unlike the `L1StandardBridge` [here](https://etherscan.io/address/0x697402166Fbf2F22E970df8a6486Ef171dbfc524) --- contracts/chain-adapters/Blast_Adapter.sol | 32 ++++++++++++++++++---- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/contracts/chain-adapters/Blast_Adapter.sol b/contracts/chain-adapters/Blast_Adapter.sol index ed4d10a36..c56fbad43 100644 --- a/contracts/chain-adapters/Blast_Adapter.sol +++ b/contracts/chain-adapters/Blast_Adapter.sol @@ -7,8 +7,7 @@ import "../external/interfaces/WETH9Interface.sol"; // @dev Use local modified CrossDomainEnabled contract instead of one exported by eth-optimism because we need // this contract's state variables to be `immutable` because of the delegateCall call. import "./CrossDomainEnabled.sol"; -import "@eth-optimism/contracts/L1/messaging/IL1StandardBridge.sol"; -import "@eth-optimism/contracts/L1/messaging/IL1ERC20Bridge.sol"; +import { IL1StandardBridge } from "@eth-optimism/contracts/L1/messaging/IL1StandardBridge.sol"; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; @@ -16,6 +15,29 @@ import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; import "../libraries/CircleCCTPAdapter.sol"; import "../external/interfaces/CCTPInterfaces.sol"; +interface IL1ERC20Bridge { + /// @notice Sends ERC20 tokens to a receiver's address on the other chain. Note that if the + /// ERC20 token on the other chain does not recognize the local token as the correct + /// pair token, the ERC20 bridge will fail and the tokens will be returned to sender on + /// this chain. + /// @param _localToken Address of the ERC20 on this chain. + /// @param _remoteToken Address of the corresponding token on the remote chain. + /// @param _to Address of the receiver. + /// @param _amount Amount of local tokens to deposit. + /// @param _minGasLimit Minimum amount of gas that the bridge can be relayed with. + /// @param _extraData Extra data to be sent with the transaction. Note that the recipient will + /// not be triggered with this data, but it will be emitted and can be used + /// to identify the transaction. + function bridgeERC20To( + address _localToken, + address _remoteToken, + address _to, + uint256 _amount, + uint32 _minGasLimit, + bytes calldata _extraData + ) external; +} + /** * @notice Contract containing logic to send messages from L1 to Blast. This is a modified version of the Optimism adapter * that excludes the custom bridging logic. It differs from the Base Adapter in that it uses a special @@ -29,7 +51,7 @@ contract Blast_Adapter is CrossDomainEnabled, AdapterInterface, CircleCCTPAdapte WETH9Interface public immutable L1_WETH; - IL1StandardBridge public immutable L1_STANDARD_BRIDGE; + IL1StandardBridge public immutable L1_STANDARD_BRIDGE; // 0x697402166Fbf2F22E970df8a6486Ef171dbfc524 // Bridge used to get yielding version of ERC20's on L2. IL1ERC20Bridge public immutable L1_BLAST_BRIDGE; // 0x3a05E5d33d7Ab3864D53aaEc93c8301C1Fa49115 on mainnet. @@ -49,7 +71,7 @@ contract Blast_Adapter is CrossDomainEnabled, AdapterInterface, CircleCCTPAdapte IL1StandardBridge _l1StandardBridge, IERC20 _l1Usdc, ITokenMessenger _cctpTokenMessenger, - IL1StandardBridge l1BlastBridge, + IL1ERC20Bridge l1BlastBridge, address l1Dai, uint32 l2GasLimit ) CrossDomainEnabled(_crossDomainMessenger) CircleCCTPAdapter(_l1Usdc, _cctpTokenMessenger, CircleDomainIds.Base) { @@ -95,7 +117,7 @@ contract Blast_Adapter is CrossDomainEnabled, AdapterInterface, CircleCCTPAdapte // Check if this token is DAI, then use the L1 Blast Bridge else if (l1Token == L1_DAI) { IERC20(l1Token).safeIncreaseAllowance(address(L1_BLAST_BRIDGE), amount); - IL1ERC20Bridge(L1_BLAST_BRIDGE).depositERC20To(l1Token, l2Token, to, amount, L2_GAS_LIMIT, ""); + IL1ERC20Bridge(L1_BLAST_BRIDGE).bridgeERC20To(l1Token, l2Token, to, amount, L2_GAS_LIMIT, ""); } else { IL1StandardBridge _l1StandardBridge = L1_STANDARD_BRIDGE; From 54ff5207cb871551260f41d34eb1e560e9ee35e1 Mon Sep 17 00:00:00 2001 From: nicholaspai Date: Mon, 17 Jun 2024 13:37:16 -0400 Subject: [PATCH 2/2] frge --- storage-layouts/Arbitrum_SpokePool.json | 72 ++++++++++----------- storage-layouts/Base_SpokePool.json | 78 +++++++++++----------- storage-layouts/Ethereum_SpokePool.json | 74 ++++++++++----------- storage-layouts/Linea_SpokePool.json | 86 ++++++++++++------------- storage-layouts/Mode_SpokePool.json | 78 +++++++++++----------- storage-layouts/Optimism_SpokePool.json | 78 +++++++++++----------- storage-layouts/Polygon_SpokePool.json | 78 +++++++++++----------- storage-layouts/ZkSync_SpokePool.json | 76 +++++++++++----------- 8 files changed, 310 insertions(+), 310 deletions(-) diff --git a/storage-layouts/Arbitrum_SpokePool.json b/storage-layouts/Arbitrum_SpokePool.json index 99f60a6bd..715109401 100644 --- a/storage-layouts/Arbitrum_SpokePool.json +++ b/storage-layouts/Arbitrum_SpokePool.json @@ -1,7 +1,7 @@ { "storage": [ { - "astId": 65577, + "astId": 59618, "contract": "contracts/Arbitrum_SpokePool.sol:Arbitrum_SpokePool", "label": "_initialized", "offset": 0, @@ -9,7 +9,7 @@ "type": "t_uint8" }, { - "astId": 65580, + "astId": 59621, "contract": "contracts/Arbitrum_SpokePool.sol:Arbitrum_SpokePool", "label": "_initializing", "offset": 1, @@ -17,7 +17,7 @@ "type": "t_bool" }, { - "astId": 65559, + "astId": 59600, "contract": "contracts/Arbitrum_SpokePool.sol:Arbitrum_SpokePool", "label": "__gap", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_array(t_uint256)50_storage" }, { - "astId": 65875, + "astId": 59916, "contract": "contracts/Arbitrum_SpokePool.sol:Arbitrum_SpokePool", "label": "__gap", "offset": 0, @@ -33,7 +33,7 @@ "type": "t_array(t_uint256)50_storage" }, { - "astId": 65891, + "astId": 59932, "contract": "contracts/Arbitrum_SpokePool.sol:Arbitrum_SpokePool", "label": "_status", "offset": 0, @@ -41,7 +41,7 @@ "type": "t_uint256" }, { - "astId": 65960, + "astId": 60001, "contract": "contracts/Arbitrum_SpokePool.sol:Arbitrum_SpokePool", "label": "__gap", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_array(t_uint256)49_storage" }, { - "astId": 17991, + "astId": 12251, "contract": "contracts/Arbitrum_SpokePool.sol:Arbitrum_SpokePool", "label": "__gap", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_array(t_uint256)1000_storage" }, { - "astId": 17723, + "astId": 11983, "contract": "contracts/Arbitrum_SpokePool.sol:Arbitrum_SpokePool", "label": "_HASHED_NAME", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_bytes32" }, { - "astId": 17725, + "astId": 11985, "contract": "contracts/Arbitrum_SpokePool.sol:Arbitrum_SpokePool", "label": "_HASHED_VERSION", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_bytes32" }, { - "astId": 17824, + "astId": 12084, "contract": "contracts/Arbitrum_SpokePool.sol:Arbitrum_SpokePool", "label": "__gap", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_array(t_uint256)1000_storage" }, { - "astId": 5938, + "astId": 5706, "contract": "contracts/Arbitrum_SpokePool.sol:Arbitrum_SpokePool", "label": "crossDomainAdmin", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_address" }, { - "astId": 5940, + "astId": 5708, "contract": "contracts/Arbitrum_SpokePool.sol:Arbitrum_SpokePool", "label": "hubPool", "offset": 0, @@ -97,15 +97,15 @@ "type": "t_address" }, { - "astId": 5943, + "astId": 5711, "contract": "contracts/Arbitrum_SpokePool.sol:Arbitrum_SpokePool", "label": "DEPRECATED_wrappedNativeToken", "offset": 0, "slot": "2155", - "type": "t_contract(WETH9Interface)13461" + "type": "t_contract(WETH9Interface)9058" }, { - "astId": 5945, + "astId": 5713, "contract": "contracts/Arbitrum_SpokePool.sol:Arbitrum_SpokePool", "label": "DEPRECATED_depositQuoteTimeBuffer", "offset": 20, @@ -113,7 +113,7 @@ "type": "t_uint32" }, { - "astId": 5947, + "astId": 5715, "contract": "contracts/Arbitrum_SpokePool.sol:Arbitrum_SpokePool", "label": "numberOfDeposits", "offset": 24, @@ -121,7 +121,7 @@ "type": "t_uint32" }, { - "astId": 5949, + "astId": 5717, "contract": "contracts/Arbitrum_SpokePool.sol:Arbitrum_SpokePool", "label": "pausedFills", "offset": 28, @@ -129,7 +129,7 @@ "type": "t_bool" }, { - "astId": 5951, + "astId": 5719, "contract": "contracts/Arbitrum_SpokePool.sol:Arbitrum_SpokePool", "label": "pausedDeposits", "offset": 29, @@ -137,15 +137,15 @@ "type": "t_bool" }, { - "astId": 5955, + "astId": 5723, "contract": "contracts/Arbitrum_SpokePool.sol:Arbitrum_SpokePool", "label": "rootBundles", "offset": 0, "slot": "2156", - "type": "t_array(t_struct(RootBundle)14038_storage)dyn_storage" + "type": "t_array(t_struct(RootBundle)9635_storage)dyn_storage" }, { - "astId": 5961, + "astId": 5729, "contract": "contracts/Arbitrum_SpokePool.sol:Arbitrum_SpokePool", "label": "enabledDepositRoutes", "offset": 0, @@ -153,7 +153,7 @@ "type": "t_mapping(t_address,t_mapping(t_uint256,t_bool))" }, { - "astId": 5965, + "astId": 5733, "contract": "contracts/Arbitrum_SpokePool.sol:Arbitrum_SpokePool", "label": "DEPRECATED_relayFills", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_mapping(t_bytes32,t_uint256)" }, { - "astId": 5969, + "astId": 5737, "contract": "contracts/Arbitrum_SpokePool.sol:Arbitrum_SpokePool", "label": "DEPRECATED_fillCounter", "offset": 0, @@ -169,7 +169,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5973, + "astId": 5741, "contract": "contracts/Arbitrum_SpokePool.sol:Arbitrum_SpokePool", "label": "DEPRECATED_depositCounter", "offset": 0, @@ -177,7 +177,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5977, + "astId": 5745, "contract": "contracts/Arbitrum_SpokePool.sol:Arbitrum_SpokePool", "label": "DEPRECATED_refundsRequested", "offset": 0, @@ -185,7 +185,7 @@ "type": "t_mapping(t_bytes32,t_uint256)" }, { - "astId": 5981, + "astId": 5749, "contract": "contracts/Arbitrum_SpokePool.sol:Arbitrum_SpokePool", "label": "fillStatuses", "offset": 0, @@ -193,7 +193,7 @@ "type": "t_mapping(t_bytes32,t_uint256)" }, { - "astId": 7882, + "astId": 7650, "contract": "contracts/Arbitrum_SpokePool.sol:Arbitrum_SpokePool", "label": "__gap", "offset": 0, @@ -201,7 +201,7 @@ "type": "t_array(t_uint256)999_storage" }, { - "astId": 98, + "astId": 24, "contract": "contracts/Arbitrum_SpokePool.sol:Arbitrum_SpokePool", "label": "l2GatewayRouter", "offset": 0, @@ -209,7 +209,7 @@ "type": "t_address" }, { - "astId": 102, + "astId": 28, "contract": "contracts/Arbitrum_SpokePool.sol:Arbitrum_SpokePool", "label": "whitelistedTokens", "offset": 0, @@ -223,11 +223,11 @@ "label": "address", "numberOfBytes": "20" }, - "t_array(t_struct(RootBundle)14038_storage)dyn_storage": { + "t_array(t_struct(RootBundle)9635_storage)dyn_storage": { "encoding": "dynamic_array", "label": "struct SpokePoolInterface.RootBundle[]", "numberOfBytes": "32", - "base": "t_struct(RootBundle)14038_storage" + "base": "t_struct(RootBundle)9635_storage" }, "t_array(t_uint256)1000_storage": { "encoding": "inplace", @@ -263,7 +263,7 @@ "label": "bytes32", "numberOfBytes": "32" }, - "t_contract(WETH9Interface)13461": { + "t_contract(WETH9Interface)9058": { "encoding": "inplace", "label": "contract WETH9Interface", "numberOfBytes": "20" @@ -310,13 +310,13 @@ "numberOfBytes": "32", "value": "t_uint256" }, - "t_struct(RootBundle)14038_storage": { + "t_struct(RootBundle)9635_storage": { "encoding": "inplace", "label": "struct SpokePoolInterface.RootBundle", "numberOfBytes": "96", "members": [ { - "astId": 14031, + "astId": 9628, "contract": "contracts/Arbitrum_SpokePool.sol:Arbitrum_SpokePool", "label": "slowRelayRoot", "offset": 0, @@ -324,7 +324,7 @@ "type": "t_bytes32" }, { - "astId": 14033, + "astId": 9630, "contract": "contracts/Arbitrum_SpokePool.sol:Arbitrum_SpokePool", "label": "relayerRefundRoot", "offset": 0, @@ -332,7 +332,7 @@ "type": "t_bytes32" }, { - "astId": 14037, + "astId": 9634, "contract": "contracts/Arbitrum_SpokePool.sol:Arbitrum_SpokePool", "label": "claimedBitmap", "offset": 0, diff --git a/storage-layouts/Base_SpokePool.json b/storage-layouts/Base_SpokePool.json index 0f2b88ab1..f40eea1f4 100644 --- a/storage-layouts/Base_SpokePool.json +++ b/storage-layouts/Base_SpokePool.json @@ -1,7 +1,7 @@ { "storage": [ { - "astId": 65577, + "astId": 5733, "contract": "contracts/Base_SpokePool.sol:Base_SpokePool", "label": "_initialized", "offset": 0, @@ -9,7 +9,7 @@ "type": "t_uint8" }, { - "astId": 65580, + "astId": 5736, "contract": "contracts/Base_SpokePool.sol:Base_SpokePool", "label": "_initializing", "offset": 1, @@ -17,7 +17,7 @@ "type": "t_bool" }, { - "astId": 65559, + "astId": 5715, "contract": "contracts/Base_SpokePool.sol:Base_SpokePool", "label": "__gap", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_array(t_uint256)50_storage" }, { - "astId": 65875, + "astId": 6031, "contract": "contracts/Base_SpokePool.sol:Base_SpokePool", "label": "__gap", "offset": 0, @@ -33,7 +33,7 @@ "type": "t_array(t_uint256)50_storage" }, { - "astId": 65891, + "astId": 6047, "contract": "contracts/Base_SpokePool.sol:Base_SpokePool", "label": "_status", "offset": 0, @@ -41,7 +41,7 @@ "type": "t_uint256" }, { - "astId": 65960, + "astId": 6116, "contract": "contracts/Base_SpokePool.sol:Base_SpokePool", "label": "__gap", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_array(t_uint256)49_storage" }, { - "astId": 17991, + "astId": 5085, "contract": "contracts/Base_SpokePool.sol:Base_SpokePool", "label": "__gap", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_array(t_uint256)1000_storage" }, { - "astId": 17723, + "astId": 4817, "contract": "contracts/Base_SpokePool.sol:Base_SpokePool", "label": "_HASHED_NAME", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_bytes32" }, { - "astId": 17725, + "astId": 4819, "contract": "contracts/Base_SpokePool.sol:Base_SpokePool", "label": "_HASHED_VERSION", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_bytes32" }, { - "astId": 17824, + "astId": 4918, "contract": "contracts/Base_SpokePool.sol:Base_SpokePool", "label": "__gap", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_array(t_uint256)1000_storage" }, { - "astId": 5938, + "astId": 1195, "contract": "contracts/Base_SpokePool.sol:Base_SpokePool", "label": "crossDomainAdmin", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_address" }, { - "astId": 5940, + "astId": 1197, "contract": "contracts/Base_SpokePool.sol:Base_SpokePool", "label": "hubPool", "offset": 0, @@ -97,15 +97,15 @@ "type": "t_address" }, { - "astId": 5943, + "astId": 1200, "contract": "contracts/Base_SpokePool.sol:Base_SpokePool", "label": "DEPRECATED_wrappedNativeToken", "offset": 0, "slot": "2155", - "type": "t_contract(WETH9Interface)13461" + "type": "t_contract(WETH9Interface)3527" }, { - "astId": 5945, + "astId": 1202, "contract": "contracts/Base_SpokePool.sol:Base_SpokePool", "label": "DEPRECATED_depositQuoteTimeBuffer", "offset": 20, @@ -113,7 +113,7 @@ "type": "t_uint32" }, { - "astId": 5947, + "astId": 1204, "contract": "contracts/Base_SpokePool.sol:Base_SpokePool", "label": "numberOfDeposits", "offset": 24, @@ -121,7 +121,7 @@ "type": "t_uint32" }, { - "astId": 5949, + "astId": 1206, "contract": "contracts/Base_SpokePool.sol:Base_SpokePool", "label": "pausedFills", "offset": 28, @@ -129,7 +129,7 @@ "type": "t_bool" }, { - "astId": 5951, + "astId": 1208, "contract": "contracts/Base_SpokePool.sol:Base_SpokePool", "label": "pausedDeposits", "offset": 29, @@ -137,15 +137,15 @@ "type": "t_bool" }, { - "astId": 5955, + "astId": 1212, "contract": "contracts/Base_SpokePool.sol:Base_SpokePool", "label": "rootBundles", "offset": 0, "slot": "2156", - "type": "t_array(t_struct(RootBundle)14038_storage)dyn_storage" + "type": "t_array(t_struct(RootBundle)3792_storage)dyn_storage" }, { - "astId": 5961, + "astId": 1218, "contract": "contracts/Base_SpokePool.sol:Base_SpokePool", "label": "enabledDepositRoutes", "offset": 0, @@ -153,7 +153,7 @@ "type": "t_mapping(t_address,t_mapping(t_uint256,t_bool))" }, { - "astId": 5965, + "astId": 1222, "contract": "contracts/Base_SpokePool.sol:Base_SpokePool", "label": "DEPRECATED_relayFills", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_mapping(t_bytes32,t_uint256)" }, { - "astId": 5969, + "astId": 1226, "contract": "contracts/Base_SpokePool.sol:Base_SpokePool", "label": "DEPRECATED_fillCounter", "offset": 0, @@ -169,7 +169,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5973, + "astId": 1230, "contract": "contracts/Base_SpokePool.sol:Base_SpokePool", "label": "DEPRECATED_depositCounter", "offset": 0, @@ -177,7 +177,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5977, + "astId": 1234, "contract": "contracts/Base_SpokePool.sol:Base_SpokePool", "label": "DEPRECATED_refundsRequested", "offset": 0, @@ -185,7 +185,7 @@ "type": "t_mapping(t_bytes32,t_uint256)" }, { - "astId": 5981, + "astId": 1238, "contract": "contracts/Base_SpokePool.sol:Base_SpokePool", "label": "fillStatuses", "offset": 0, @@ -193,7 +193,7 @@ "type": "t_mapping(t_bytes32,t_uint256)" }, { - "astId": 7882, + "astId": 3139, "contract": "contracts/Base_SpokePool.sol:Base_SpokePool", "label": "__gap", "offset": 0, @@ -201,7 +201,7 @@ "type": "t_array(t_uint256)999_storage" }, { - "astId": 4147, + "astId": 861, "contract": "contracts/Base_SpokePool.sol:Base_SpokePool", "label": "l1Gas", "offset": 0, @@ -209,7 +209,7 @@ "type": "t_uint32" }, { - "astId": 4149, + "astId": 863, "contract": "contracts/Base_SpokePool.sol:Base_SpokePool", "label": "l2Eth", "offset": 4, @@ -217,7 +217,7 @@ "type": "t_address" }, { - "astId": 4155, + "astId": 869, "contract": "contracts/Base_SpokePool.sol:Base_SpokePool", "label": "__deprecated_messenger", "offset": 0, @@ -225,7 +225,7 @@ "type": "t_address" }, { - "astId": 4165, + "astId": 879, "contract": "contracts/Base_SpokePool.sol:Base_SpokePool", "label": "tokenBridges", "offset": 0, @@ -233,7 +233,7 @@ "type": "t_mapping(t_address,t_address)" }, { - "astId": 4431, + "astId": 1145, "contract": "contracts/Base_SpokePool.sol:Base_SpokePool", "label": "__gap", "offset": 0, @@ -247,11 +247,11 @@ "label": "address", "numberOfBytes": "20" }, - "t_array(t_struct(RootBundle)14038_storage)dyn_storage": { + "t_array(t_struct(RootBundle)3792_storage)dyn_storage": { "encoding": "dynamic_array", "label": "struct SpokePoolInterface.RootBundle[]", "numberOfBytes": "32", - "base": "t_struct(RootBundle)14038_storage" + "base": "t_struct(RootBundle)3792_storage" }, "t_array(t_uint256)1000_storage": { "encoding": "inplace", @@ -287,7 +287,7 @@ "label": "bytes32", "numberOfBytes": "32" }, - "t_contract(WETH9Interface)13461": { + "t_contract(WETH9Interface)3527": { "encoding": "inplace", "label": "contract WETH9Interface", "numberOfBytes": "20" @@ -334,13 +334,13 @@ "numberOfBytes": "32", "value": "t_uint256" }, - "t_struct(RootBundle)14038_storage": { + "t_struct(RootBundle)3792_storage": { "encoding": "inplace", "label": "struct SpokePoolInterface.RootBundle", "numberOfBytes": "96", "members": [ { - "astId": 14031, + "astId": 3785, "contract": "contracts/Base_SpokePool.sol:Base_SpokePool", "label": "slowRelayRoot", "offset": 0, @@ -348,7 +348,7 @@ "type": "t_bytes32" }, { - "astId": 14033, + "astId": 3787, "contract": "contracts/Base_SpokePool.sol:Base_SpokePool", "label": "relayerRefundRoot", "offset": 0, @@ -356,7 +356,7 @@ "type": "t_bytes32" }, { - "astId": 14037, + "astId": 3791, "contract": "contracts/Base_SpokePool.sol:Base_SpokePool", "label": "claimedBitmap", "offset": 0, diff --git a/storage-layouts/Ethereum_SpokePool.json b/storage-layouts/Ethereum_SpokePool.json index 525b4f575..33dbc07b2 100644 --- a/storage-layouts/Ethereum_SpokePool.json +++ b/storage-layouts/Ethereum_SpokePool.json @@ -1,7 +1,7 @@ { "storage": [ { - "astId": 65577, + "astId": 59618, "contract": "contracts/Ethereum_SpokePool.sol:Ethereum_SpokePool", "label": "_initialized", "offset": 0, @@ -9,7 +9,7 @@ "type": "t_uint8" }, { - "astId": 65580, + "astId": 59621, "contract": "contracts/Ethereum_SpokePool.sol:Ethereum_SpokePool", "label": "_initializing", "offset": 1, @@ -17,7 +17,7 @@ "type": "t_bool" }, { - "astId": 65559, + "astId": 59600, "contract": "contracts/Ethereum_SpokePool.sol:Ethereum_SpokePool", "label": "__gap", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_array(t_uint256)50_storage" }, { - "astId": 65875, + "astId": 59916, "contract": "contracts/Ethereum_SpokePool.sol:Ethereum_SpokePool", "label": "__gap", "offset": 0, @@ -33,7 +33,7 @@ "type": "t_array(t_uint256)50_storage" }, { - "astId": 65891, + "astId": 59932, "contract": "contracts/Ethereum_SpokePool.sol:Ethereum_SpokePool", "label": "_status", "offset": 0, @@ -41,7 +41,7 @@ "type": "t_uint256" }, { - "astId": 65960, + "astId": 60001, "contract": "contracts/Ethereum_SpokePool.sol:Ethereum_SpokePool", "label": "__gap", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_array(t_uint256)49_storage" }, { - "astId": 17991, + "astId": 12251, "contract": "contracts/Ethereum_SpokePool.sol:Ethereum_SpokePool", "label": "__gap", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_array(t_uint256)1000_storage" }, { - "astId": 17723, + "astId": 11983, "contract": "contracts/Ethereum_SpokePool.sol:Ethereum_SpokePool", "label": "_HASHED_NAME", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_bytes32" }, { - "astId": 17725, + "astId": 11985, "contract": "contracts/Ethereum_SpokePool.sol:Ethereum_SpokePool", "label": "_HASHED_VERSION", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_bytes32" }, { - "astId": 17824, + "astId": 12084, "contract": "contracts/Ethereum_SpokePool.sol:Ethereum_SpokePool", "label": "__gap", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_array(t_uint256)1000_storage" }, { - "astId": 5938, + "astId": 5706, "contract": "contracts/Ethereum_SpokePool.sol:Ethereum_SpokePool", "label": "crossDomainAdmin", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_address" }, { - "astId": 5940, + "astId": 5708, "contract": "contracts/Ethereum_SpokePool.sol:Ethereum_SpokePool", "label": "hubPool", "offset": 0, @@ -97,15 +97,15 @@ "type": "t_address" }, { - "astId": 5943, + "astId": 5711, "contract": "contracts/Ethereum_SpokePool.sol:Ethereum_SpokePool", "label": "DEPRECATED_wrappedNativeToken", "offset": 0, "slot": "2155", - "type": "t_contract(WETH9Interface)13461" + "type": "t_contract(WETH9Interface)9058" }, { - "astId": 5945, + "astId": 5713, "contract": "contracts/Ethereum_SpokePool.sol:Ethereum_SpokePool", "label": "DEPRECATED_depositQuoteTimeBuffer", "offset": 20, @@ -113,7 +113,7 @@ "type": "t_uint32" }, { - "astId": 5947, + "astId": 5715, "contract": "contracts/Ethereum_SpokePool.sol:Ethereum_SpokePool", "label": "numberOfDeposits", "offset": 24, @@ -121,7 +121,7 @@ "type": "t_uint32" }, { - "astId": 5949, + "astId": 5717, "contract": "contracts/Ethereum_SpokePool.sol:Ethereum_SpokePool", "label": "pausedFills", "offset": 28, @@ -129,7 +129,7 @@ "type": "t_bool" }, { - "astId": 5951, + "astId": 5719, "contract": "contracts/Ethereum_SpokePool.sol:Ethereum_SpokePool", "label": "pausedDeposits", "offset": 29, @@ -137,15 +137,15 @@ "type": "t_bool" }, { - "astId": 5955, + "astId": 5723, "contract": "contracts/Ethereum_SpokePool.sol:Ethereum_SpokePool", "label": "rootBundles", "offset": 0, "slot": "2156", - "type": "t_array(t_struct(RootBundle)14038_storage)dyn_storage" + "type": "t_array(t_struct(RootBundle)9635_storage)dyn_storage" }, { - "astId": 5961, + "astId": 5729, "contract": "contracts/Ethereum_SpokePool.sol:Ethereum_SpokePool", "label": "enabledDepositRoutes", "offset": 0, @@ -153,7 +153,7 @@ "type": "t_mapping(t_address,t_mapping(t_uint256,t_bool))" }, { - "astId": 5965, + "astId": 5733, "contract": "contracts/Ethereum_SpokePool.sol:Ethereum_SpokePool", "label": "DEPRECATED_relayFills", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_mapping(t_bytes32,t_uint256)" }, { - "astId": 5969, + "astId": 5737, "contract": "contracts/Ethereum_SpokePool.sol:Ethereum_SpokePool", "label": "DEPRECATED_fillCounter", "offset": 0, @@ -169,7 +169,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5973, + "astId": 5741, "contract": "contracts/Ethereum_SpokePool.sol:Ethereum_SpokePool", "label": "DEPRECATED_depositCounter", "offset": 0, @@ -177,7 +177,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5977, + "astId": 5745, "contract": "contracts/Ethereum_SpokePool.sol:Ethereum_SpokePool", "label": "DEPRECATED_refundsRequested", "offset": 0, @@ -185,7 +185,7 @@ "type": "t_mapping(t_bytes32,t_uint256)" }, { - "astId": 5981, + "astId": 5749, "contract": "contracts/Ethereum_SpokePool.sol:Ethereum_SpokePool", "label": "fillStatuses", "offset": 0, @@ -193,7 +193,7 @@ "type": "t_mapping(t_bytes32,t_uint256)" }, { - "astId": 7882, + "astId": 7650, "contract": "contracts/Ethereum_SpokePool.sol:Ethereum_SpokePool", "label": "__gap", "offset": 0, @@ -201,7 +201,7 @@ "type": "t_array(t_uint256)999_storage" }, { - "astId": 66831, + "astId": 60872, "contract": "contracts/Ethereum_SpokePool.sol:Ethereum_SpokePool", "label": "__gap", "offset": 0, @@ -209,7 +209,7 @@ "type": "t_array(t_uint256)50_storage" }, { - "astId": 65029, + "astId": 59070, "contract": "contracts/Ethereum_SpokePool.sol:Ethereum_SpokePool", "label": "_owner", "offset": 0, @@ -217,7 +217,7 @@ "type": "t_address" }, { - "astId": 65149, + "astId": 59190, "contract": "contracts/Ethereum_SpokePool.sol:Ethereum_SpokePool", "label": "__gap", "offset": 0, @@ -231,11 +231,11 @@ "label": "address", "numberOfBytes": "20" }, - "t_array(t_struct(RootBundle)14038_storage)dyn_storage": { + "t_array(t_struct(RootBundle)9635_storage)dyn_storage": { "encoding": "dynamic_array", "label": "struct SpokePoolInterface.RootBundle[]", "numberOfBytes": "32", - "base": "t_struct(RootBundle)14038_storage" + "base": "t_struct(RootBundle)9635_storage" }, "t_array(t_uint256)1000_storage": { "encoding": "inplace", @@ -271,7 +271,7 @@ "label": "bytes32", "numberOfBytes": "32" }, - "t_contract(WETH9Interface)13461": { + "t_contract(WETH9Interface)9058": { "encoding": "inplace", "label": "contract WETH9Interface", "numberOfBytes": "20" @@ -311,13 +311,13 @@ "numberOfBytes": "32", "value": "t_uint256" }, - "t_struct(RootBundle)14038_storage": { + "t_struct(RootBundle)9635_storage": { "encoding": "inplace", "label": "struct SpokePoolInterface.RootBundle", "numberOfBytes": "96", "members": [ { - "astId": 14031, + "astId": 9628, "contract": "contracts/Ethereum_SpokePool.sol:Ethereum_SpokePool", "label": "slowRelayRoot", "offset": 0, @@ -325,7 +325,7 @@ "type": "t_bytes32" }, { - "astId": 14033, + "astId": 9630, "contract": "contracts/Ethereum_SpokePool.sol:Ethereum_SpokePool", "label": "relayerRefundRoot", "offset": 0, @@ -333,7 +333,7 @@ "type": "t_bytes32" }, { - "astId": 14037, + "astId": 9634, "contract": "contracts/Ethereum_SpokePool.sol:Ethereum_SpokePool", "label": "claimedBitmap", "offset": 0, diff --git a/storage-layouts/Linea_SpokePool.json b/storage-layouts/Linea_SpokePool.json index de7f296fc..9adafc5e7 100644 --- a/storage-layouts/Linea_SpokePool.json +++ b/storage-layouts/Linea_SpokePool.json @@ -1,7 +1,7 @@ { "storage": [ { - "astId": 65577, + "astId": 59618, "contract": "contracts/Linea_SpokePool.sol:Linea_SpokePool", "label": "_initialized", "offset": 0, @@ -9,7 +9,7 @@ "type": "t_uint8" }, { - "astId": 65580, + "astId": 59621, "contract": "contracts/Linea_SpokePool.sol:Linea_SpokePool", "label": "_initializing", "offset": 1, @@ -17,7 +17,7 @@ "type": "t_bool" }, { - "astId": 65559, + "astId": 59600, "contract": "contracts/Linea_SpokePool.sol:Linea_SpokePool", "label": "__gap", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_array(t_uint256)50_storage" }, { - "astId": 65875, + "astId": 59916, "contract": "contracts/Linea_SpokePool.sol:Linea_SpokePool", "label": "__gap", "offset": 0, @@ -33,7 +33,7 @@ "type": "t_array(t_uint256)50_storage" }, { - "astId": 65891, + "astId": 59932, "contract": "contracts/Linea_SpokePool.sol:Linea_SpokePool", "label": "_status", "offset": 0, @@ -41,7 +41,7 @@ "type": "t_uint256" }, { - "astId": 65960, + "astId": 60001, "contract": "contracts/Linea_SpokePool.sol:Linea_SpokePool", "label": "__gap", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_array(t_uint256)49_storage" }, { - "astId": 17991, + "astId": 12251, "contract": "contracts/Linea_SpokePool.sol:Linea_SpokePool", "label": "__gap", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_array(t_uint256)1000_storage" }, { - "astId": 17723, + "astId": 11983, "contract": "contracts/Linea_SpokePool.sol:Linea_SpokePool", "label": "_HASHED_NAME", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_bytes32" }, { - "astId": 17725, + "astId": 11985, "contract": "contracts/Linea_SpokePool.sol:Linea_SpokePool", "label": "_HASHED_VERSION", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_bytes32" }, { - "astId": 17824, + "astId": 12084, "contract": "contracts/Linea_SpokePool.sol:Linea_SpokePool", "label": "__gap", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_array(t_uint256)1000_storage" }, { - "astId": 5938, + "astId": 5706, "contract": "contracts/Linea_SpokePool.sol:Linea_SpokePool", "label": "crossDomainAdmin", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_address" }, { - "astId": 5940, + "astId": 5708, "contract": "contracts/Linea_SpokePool.sol:Linea_SpokePool", "label": "hubPool", "offset": 0, @@ -97,15 +97,15 @@ "type": "t_address" }, { - "astId": 5943, + "astId": 5711, "contract": "contracts/Linea_SpokePool.sol:Linea_SpokePool", "label": "DEPRECATED_wrappedNativeToken", "offset": 0, "slot": "2155", - "type": "t_contract(WETH9Interface)13461" + "type": "t_contract(WETH9Interface)9058" }, { - "astId": 5945, + "astId": 5713, "contract": "contracts/Linea_SpokePool.sol:Linea_SpokePool", "label": "DEPRECATED_depositQuoteTimeBuffer", "offset": 20, @@ -113,7 +113,7 @@ "type": "t_uint32" }, { - "astId": 5947, + "astId": 5715, "contract": "contracts/Linea_SpokePool.sol:Linea_SpokePool", "label": "numberOfDeposits", "offset": 24, @@ -121,7 +121,7 @@ "type": "t_uint32" }, { - "astId": 5949, + "astId": 5717, "contract": "contracts/Linea_SpokePool.sol:Linea_SpokePool", "label": "pausedFills", "offset": 28, @@ -129,7 +129,7 @@ "type": "t_bool" }, { - "astId": 5951, + "astId": 5719, "contract": "contracts/Linea_SpokePool.sol:Linea_SpokePool", "label": "pausedDeposits", "offset": 29, @@ -137,15 +137,15 @@ "type": "t_bool" }, { - "astId": 5955, + "astId": 5723, "contract": "contracts/Linea_SpokePool.sol:Linea_SpokePool", "label": "rootBundles", "offset": 0, "slot": "2156", - "type": "t_array(t_struct(RootBundle)14038_storage)dyn_storage" + "type": "t_array(t_struct(RootBundle)9635_storage)dyn_storage" }, { - "astId": 5961, + "astId": 5729, "contract": "contracts/Linea_SpokePool.sol:Linea_SpokePool", "label": "enabledDepositRoutes", "offset": 0, @@ -153,7 +153,7 @@ "type": "t_mapping(t_address,t_mapping(t_uint256,t_bool))" }, { - "astId": 5965, + "astId": 5733, "contract": "contracts/Linea_SpokePool.sol:Linea_SpokePool", "label": "DEPRECATED_relayFills", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_mapping(t_bytes32,t_uint256)" }, { - "astId": 5969, + "astId": 5737, "contract": "contracts/Linea_SpokePool.sol:Linea_SpokePool", "label": "DEPRECATED_fillCounter", "offset": 0, @@ -169,7 +169,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5973, + "astId": 5741, "contract": "contracts/Linea_SpokePool.sol:Linea_SpokePool", "label": "DEPRECATED_depositCounter", "offset": 0, @@ -177,7 +177,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5977, + "astId": 5745, "contract": "contracts/Linea_SpokePool.sol:Linea_SpokePool", "label": "DEPRECATED_refundsRequested", "offset": 0, @@ -185,7 +185,7 @@ "type": "t_mapping(t_bytes32,t_uint256)" }, { - "astId": 5981, + "astId": 5749, "contract": "contracts/Linea_SpokePool.sol:Linea_SpokePool", "label": "fillStatuses", "offset": 0, @@ -193,7 +193,7 @@ "type": "t_mapping(t_bytes32,t_uint256)" }, { - "astId": 7882, + "astId": 7650, "contract": "contracts/Linea_SpokePool.sol:Linea_SpokePool", "label": "__gap", "offset": 0, @@ -201,28 +201,28 @@ "type": "t_array(t_uint256)999_storage" }, { - "astId": 3224, + "astId": 2976, "contract": "contracts/Linea_SpokePool.sol:Linea_SpokePool", "label": "l2MessageService", "offset": 0, "slot": "3162", - "type": "t_contract(IMessageService)13377" + "type": "t_contract(IMessageService)8974" }, { - "astId": 3228, + "astId": 2980, "contract": "contracts/Linea_SpokePool.sol:Linea_SpokePool", "label": "l2TokenBridge", "offset": 0, "slot": "3163", - "type": "t_contract(ITokenBridge)13389" + "type": "t_contract(ITokenBridge)8986" }, { - "astId": 3232, + "astId": 2984, "contract": "contracts/Linea_SpokePool.sol:Linea_SpokePool", "label": "l2UsdcBridge", "offset": 0, "slot": "3164", - "type": "t_contract(IUSDCBridge)13403" + "type": "t_contract(IUSDCBridge)9000" } ], "types": { @@ -231,11 +231,11 @@ "label": "address", "numberOfBytes": "20" }, - "t_array(t_struct(RootBundle)14038_storage)dyn_storage": { + "t_array(t_struct(RootBundle)9635_storage)dyn_storage": { "encoding": "dynamic_array", "label": "struct SpokePoolInterface.RootBundle[]", "numberOfBytes": "32", - "base": "t_struct(RootBundle)14038_storage" + "base": "t_struct(RootBundle)9635_storage" }, "t_array(t_uint256)1000_storage": { "encoding": "inplace", @@ -271,22 +271,22 @@ "label": "bytes32", "numberOfBytes": "32" }, - "t_contract(IMessageService)13377": { + "t_contract(IMessageService)8974": { "encoding": "inplace", "label": "contract IMessageService", "numberOfBytes": "20" }, - "t_contract(ITokenBridge)13389": { + "t_contract(ITokenBridge)8986": { "encoding": "inplace", "label": "contract ITokenBridge", "numberOfBytes": "20" }, - "t_contract(IUSDCBridge)13403": { + "t_contract(IUSDCBridge)9000": { "encoding": "inplace", "label": "contract IUSDCBridge", "numberOfBytes": "20" }, - "t_contract(WETH9Interface)13461": { + "t_contract(WETH9Interface)9058": { "encoding": "inplace", "label": "contract WETH9Interface", "numberOfBytes": "20" @@ -326,13 +326,13 @@ "numberOfBytes": "32", "value": "t_uint256" }, - "t_struct(RootBundle)14038_storage": { + "t_struct(RootBundle)9635_storage": { "encoding": "inplace", "label": "struct SpokePoolInterface.RootBundle", "numberOfBytes": "96", "members": [ { - "astId": 14031, + "astId": 9628, "contract": "contracts/Linea_SpokePool.sol:Linea_SpokePool", "label": "slowRelayRoot", "offset": 0, @@ -340,7 +340,7 @@ "type": "t_bytes32" }, { - "astId": 14033, + "astId": 9630, "contract": "contracts/Linea_SpokePool.sol:Linea_SpokePool", "label": "relayerRefundRoot", "offset": 0, @@ -348,7 +348,7 @@ "type": "t_bytes32" }, { - "astId": 14037, + "astId": 9634, "contract": "contracts/Linea_SpokePool.sol:Linea_SpokePool", "label": "claimedBitmap", "offset": 0, diff --git a/storage-layouts/Mode_SpokePool.json b/storage-layouts/Mode_SpokePool.json index 73d890107..1a376afd7 100644 --- a/storage-layouts/Mode_SpokePool.json +++ b/storage-layouts/Mode_SpokePool.json @@ -1,7 +1,7 @@ { "storage": [ { - "astId": 65577, + "astId": 5733, "contract": "contracts/Mode_SpokePool.sol:Mode_SpokePool", "label": "_initialized", "offset": 0, @@ -9,7 +9,7 @@ "type": "t_uint8" }, { - "astId": 65580, + "astId": 5736, "contract": "contracts/Mode_SpokePool.sol:Mode_SpokePool", "label": "_initializing", "offset": 1, @@ -17,7 +17,7 @@ "type": "t_bool" }, { - "astId": 65559, + "astId": 5715, "contract": "contracts/Mode_SpokePool.sol:Mode_SpokePool", "label": "__gap", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_array(t_uint256)50_storage" }, { - "astId": 65875, + "astId": 6031, "contract": "contracts/Mode_SpokePool.sol:Mode_SpokePool", "label": "__gap", "offset": 0, @@ -33,7 +33,7 @@ "type": "t_array(t_uint256)50_storage" }, { - "astId": 65891, + "astId": 6047, "contract": "contracts/Mode_SpokePool.sol:Mode_SpokePool", "label": "_status", "offset": 0, @@ -41,7 +41,7 @@ "type": "t_uint256" }, { - "astId": 65960, + "astId": 6116, "contract": "contracts/Mode_SpokePool.sol:Mode_SpokePool", "label": "__gap", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_array(t_uint256)49_storage" }, { - "astId": 17991, + "astId": 5085, "contract": "contracts/Mode_SpokePool.sol:Mode_SpokePool", "label": "__gap", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_array(t_uint256)1000_storage" }, { - "astId": 17723, + "astId": 4817, "contract": "contracts/Mode_SpokePool.sol:Mode_SpokePool", "label": "_HASHED_NAME", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_bytes32" }, { - "astId": 17725, + "astId": 4819, "contract": "contracts/Mode_SpokePool.sol:Mode_SpokePool", "label": "_HASHED_VERSION", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_bytes32" }, { - "astId": 17824, + "astId": 4918, "contract": "contracts/Mode_SpokePool.sol:Mode_SpokePool", "label": "__gap", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_array(t_uint256)1000_storage" }, { - "astId": 5938, + "astId": 1195, "contract": "contracts/Mode_SpokePool.sol:Mode_SpokePool", "label": "crossDomainAdmin", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_address" }, { - "astId": 5940, + "astId": 1197, "contract": "contracts/Mode_SpokePool.sol:Mode_SpokePool", "label": "hubPool", "offset": 0, @@ -97,15 +97,15 @@ "type": "t_address" }, { - "astId": 5943, + "astId": 1200, "contract": "contracts/Mode_SpokePool.sol:Mode_SpokePool", "label": "DEPRECATED_wrappedNativeToken", "offset": 0, "slot": "2155", - "type": "t_contract(WETH9Interface)13461" + "type": "t_contract(WETH9Interface)3527" }, { - "astId": 5945, + "astId": 1202, "contract": "contracts/Mode_SpokePool.sol:Mode_SpokePool", "label": "DEPRECATED_depositQuoteTimeBuffer", "offset": 20, @@ -113,7 +113,7 @@ "type": "t_uint32" }, { - "astId": 5947, + "astId": 1204, "contract": "contracts/Mode_SpokePool.sol:Mode_SpokePool", "label": "numberOfDeposits", "offset": 24, @@ -121,7 +121,7 @@ "type": "t_uint32" }, { - "astId": 5949, + "astId": 1206, "contract": "contracts/Mode_SpokePool.sol:Mode_SpokePool", "label": "pausedFills", "offset": 28, @@ -129,7 +129,7 @@ "type": "t_bool" }, { - "astId": 5951, + "astId": 1208, "contract": "contracts/Mode_SpokePool.sol:Mode_SpokePool", "label": "pausedDeposits", "offset": 29, @@ -137,15 +137,15 @@ "type": "t_bool" }, { - "astId": 5955, + "astId": 1212, "contract": "contracts/Mode_SpokePool.sol:Mode_SpokePool", "label": "rootBundles", "offset": 0, "slot": "2156", - "type": "t_array(t_struct(RootBundle)14038_storage)dyn_storage" + "type": "t_array(t_struct(RootBundle)3792_storage)dyn_storage" }, { - "astId": 5961, + "astId": 1218, "contract": "contracts/Mode_SpokePool.sol:Mode_SpokePool", "label": "enabledDepositRoutes", "offset": 0, @@ -153,7 +153,7 @@ "type": "t_mapping(t_address,t_mapping(t_uint256,t_bool))" }, { - "astId": 5965, + "astId": 1222, "contract": "contracts/Mode_SpokePool.sol:Mode_SpokePool", "label": "DEPRECATED_relayFills", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_mapping(t_bytes32,t_uint256)" }, { - "astId": 5969, + "astId": 1226, "contract": "contracts/Mode_SpokePool.sol:Mode_SpokePool", "label": "DEPRECATED_fillCounter", "offset": 0, @@ -169,7 +169,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5973, + "astId": 1230, "contract": "contracts/Mode_SpokePool.sol:Mode_SpokePool", "label": "DEPRECATED_depositCounter", "offset": 0, @@ -177,7 +177,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5977, + "astId": 1234, "contract": "contracts/Mode_SpokePool.sol:Mode_SpokePool", "label": "DEPRECATED_refundsRequested", "offset": 0, @@ -185,7 +185,7 @@ "type": "t_mapping(t_bytes32,t_uint256)" }, { - "astId": 5981, + "astId": 1238, "contract": "contracts/Mode_SpokePool.sol:Mode_SpokePool", "label": "fillStatuses", "offset": 0, @@ -193,7 +193,7 @@ "type": "t_mapping(t_bytes32,t_uint256)" }, { - "astId": 7882, + "astId": 3139, "contract": "contracts/Mode_SpokePool.sol:Mode_SpokePool", "label": "__gap", "offset": 0, @@ -201,7 +201,7 @@ "type": "t_array(t_uint256)999_storage" }, { - "astId": 4147, + "astId": 861, "contract": "contracts/Mode_SpokePool.sol:Mode_SpokePool", "label": "l1Gas", "offset": 0, @@ -209,7 +209,7 @@ "type": "t_uint32" }, { - "astId": 4149, + "astId": 863, "contract": "contracts/Mode_SpokePool.sol:Mode_SpokePool", "label": "l2Eth", "offset": 4, @@ -217,7 +217,7 @@ "type": "t_address" }, { - "astId": 4155, + "astId": 869, "contract": "contracts/Mode_SpokePool.sol:Mode_SpokePool", "label": "__deprecated_messenger", "offset": 0, @@ -225,7 +225,7 @@ "type": "t_address" }, { - "astId": 4165, + "astId": 879, "contract": "contracts/Mode_SpokePool.sol:Mode_SpokePool", "label": "tokenBridges", "offset": 0, @@ -233,7 +233,7 @@ "type": "t_mapping(t_address,t_address)" }, { - "astId": 4431, + "astId": 1145, "contract": "contracts/Mode_SpokePool.sol:Mode_SpokePool", "label": "__gap", "offset": 0, @@ -247,11 +247,11 @@ "label": "address", "numberOfBytes": "20" }, - "t_array(t_struct(RootBundle)14038_storage)dyn_storage": { + "t_array(t_struct(RootBundle)3792_storage)dyn_storage": { "encoding": "dynamic_array", "label": "struct SpokePoolInterface.RootBundle[]", "numberOfBytes": "32", - "base": "t_struct(RootBundle)14038_storage" + "base": "t_struct(RootBundle)3792_storage" }, "t_array(t_uint256)1000_storage": { "encoding": "inplace", @@ -287,7 +287,7 @@ "label": "bytes32", "numberOfBytes": "32" }, - "t_contract(WETH9Interface)13461": { + "t_contract(WETH9Interface)3527": { "encoding": "inplace", "label": "contract WETH9Interface", "numberOfBytes": "20" @@ -334,13 +334,13 @@ "numberOfBytes": "32", "value": "t_uint256" }, - "t_struct(RootBundle)14038_storage": { + "t_struct(RootBundle)3792_storage": { "encoding": "inplace", "label": "struct SpokePoolInterface.RootBundle", "numberOfBytes": "96", "members": [ { - "astId": 14031, + "astId": 3785, "contract": "contracts/Mode_SpokePool.sol:Mode_SpokePool", "label": "slowRelayRoot", "offset": 0, @@ -348,7 +348,7 @@ "type": "t_bytes32" }, { - "astId": 14033, + "astId": 3787, "contract": "contracts/Mode_SpokePool.sol:Mode_SpokePool", "label": "relayerRefundRoot", "offset": 0, @@ -356,7 +356,7 @@ "type": "t_bytes32" }, { - "astId": 14037, + "astId": 3791, "contract": "contracts/Mode_SpokePool.sol:Mode_SpokePool", "label": "claimedBitmap", "offset": 0, diff --git a/storage-layouts/Optimism_SpokePool.json b/storage-layouts/Optimism_SpokePool.json index 6287e3678..a0aa7ac4e 100644 --- a/storage-layouts/Optimism_SpokePool.json +++ b/storage-layouts/Optimism_SpokePool.json @@ -1,7 +1,7 @@ { "storage": [ { - "astId": 65577, + "astId": 5733, "contract": "contracts/Optimism_SpokePool.sol:Optimism_SpokePool", "label": "_initialized", "offset": 0, @@ -9,7 +9,7 @@ "type": "t_uint8" }, { - "astId": 65580, + "astId": 5736, "contract": "contracts/Optimism_SpokePool.sol:Optimism_SpokePool", "label": "_initializing", "offset": 1, @@ -17,7 +17,7 @@ "type": "t_bool" }, { - "astId": 65559, + "astId": 5715, "contract": "contracts/Optimism_SpokePool.sol:Optimism_SpokePool", "label": "__gap", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_array(t_uint256)50_storage" }, { - "astId": 65875, + "astId": 6031, "contract": "contracts/Optimism_SpokePool.sol:Optimism_SpokePool", "label": "__gap", "offset": 0, @@ -33,7 +33,7 @@ "type": "t_array(t_uint256)50_storage" }, { - "astId": 65891, + "astId": 6047, "contract": "contracts/Optimism_SpokePool.sol:Optimism_SpokePool", "label": "_status", "offset": 0, @@ -41,7 +41,7 @@ "type": "t_uint256" }, { - "astId": 65960, + "astId": 6116, "contract": "contracts/Optimism_SpokePool.sol:Optimism_SpokePool", "label": "__gap", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_array(t_uint256)49_storage" }, { - "astId": 17991, + "astId": 5085, "contract": "contracts/Optimism_SpokePool.sol:Optimism_SpokePool", "label": "__gap", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_array(t_uint256)1000_storage" }, { - "astId": 17723, + "astId": 4817, "contract": "contracts/Optimism_SpokePool.sol:Optimism_SpokePool", "label": "_HASHED_NAME", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_bytes32" }, { - "astId": 17725, + "astId": 4819, "contract": "contracts/Optimism_SpokePool.sol:Optimism_SpokePool", "label": "_HASHED_VERSION", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_bytes32" }, { - "astId": 17824, + "astId": 4918, "contract": "contracts/Optimism_SpokePool.sol:Optimism_SpokePool", "label": "__gap", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_array(t_uint256)1000_storage" }, { - "astId": 5938, + "astId": 1195, "contract": "contracts/Optimism_SpokePool.sol:Optimism_SpokePool", "label": "crossDomainAdmin", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_address" }, { - "astId": 5940, + "astId": 1197, "contract": "contracts/Optimism_SpokePool.sol:Optimism_SpokePool", "label": "hubPool", "offset": 0, @@ -97,15 +97,15 @@ "type": "t_address" }, { - "astId": 5943, + "astId": 1200, "contract": "contracts/Optimism_SpokePool.sol:Optimism_SpokePool", "label": "DEPRECATED_wrappedNativeToken", "offset": 0, "slot": "2155", - "type": "t_contract(WETH9Interface)13461" + "type": "t_contract(WETH9Interface)3527" }, { - "astId": 5945, + "astId": 1202, "contract": "contracts/Optimism_SpokePool.sol:Optimism_SpokePool", "label": "DEPRECATED_depositQuoteTimeBuffer", "offset": 20, @@ -113,7 +113,7 @@ "type": "t_uint32" }, { - "astId": 5947, + "astId": 1204, "contract": "contracts/Optimism_SpokePool.sol:Optimism_SpokePool", "label": "numberOfDeposits", "offset": 24, @@ -121,7 +121,7 @@ "type": "t_uint32" }, { - "astId": 5949, + "astId": 1206, "contract": "contracts/Optimism_SpokePool.sol:Optimism_SpokePool", "label": "pausedFills", "offset": 28, @@ -129,7 +129,7 @@ "type": "t_bool" }, { - "astId": 5951, + "astId": 1208, "contract": "contracts/Optimism_SpokePool.sol:Optimism_SpokePool", "label": "pausedDeposits", "offset": 29, @@ -137,15 +137,15 @@ "type": "t_bool" }, { - "astId": 5955, + "astId": 1212, "contract": "contracts/Optimism_SpokePool.sol:Optimism_SpokePool", "label": "rootBundles", "offset": 0, "slot": "2156", - "type": "t_array(t_struct(RootBundle)14038_storage)dyn_storage" + "type": "t_array(t_struct(RootBundle)3792_storage)dyn_storage" }, { - "astId": 5961, + "astId": 1218, "contract": "contracts/Optimism_SpokePool.sol:Optimism_SpokePool", "label": "enabledDepositRoutes", "offset": 0, @@ -153,7 +153,7 @@ "type": "t_mapping(t_address,t_mapping(t_uint256,t_bool))" }, { - "astId": 5965, + "astId": 1222, "contract": "contracts/Optimism_SpokePool.sol:Optimism_SpokePool", "label": "DEPRECATED_relayFills", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_mapping(t_bytes32,t_uint256)" }, { - "astId": 5969, + "astId": 1226, "contract": "contracts/Optimism_SpokePool.sol:Optimism_SpokePool", "label": "DEPRECATED_fillCounter", "offset": 0, @@ -169,7 +169,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5973, + "astId": 1230, "contract": "contracts/Optimism_SpokePool.sol:Optimism_SpokePool", "label": "DEPRECATED_depositCounter", "offset": 0, @@ -177,7 +177,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5977, + "astId": 1234, "contract": "contracts/Optimism_SpokePool.sol:Optimism_SpokePool", "label": "DEPRECATED_refundsRequested", "offset": 0, @@ -185,7 +185,7 @@ "type": "t_mapping(t_bytes32,t_uint256)" }, { - "astId": 5981, + "astId": 1238, "contract": "contracts/Optimism_SpokePool.sol:Optimism_SpokePool", "label": "fillStatuses", "offset": 0, @@ -193,7 +193,7 @@ "type": "t_mapping(t_bytes32,t_uint256)" }, { - "astId": 7882, + "astId": 3139, "contract": "contracts/Optimism_SpokePool.sol:Optimism_SpokePool", "label": "__gap", "offset": 0, @@ -201,7 +201,7 @@ "type": "t_array(t_uint256)999_storage" }, { - "astId": 4147, + "astId": 861, "contract": "contracts/Optimism_SpokePool.sol:Optimism_SpokePool", "label": "l1Gas", "offset": 0, @@ -209,7 +209,7 @@ "type": "t_uint32" }, { - "astId": 4149, + "astId": 863, "contract": "contracts/Optimism_SpokePool.sol:Optimism_SpokePool", "label": "l2Eth", "offset": 4, @@ -217,7 +217,7 @@ "type": "t_address" }, { - "astId": 4155, + "astId": 869, "contract": "contracts/Optimism_SpokePool.sol:Optimism_SpokePool", "label": "__deprecated_messenger", "offset": 0, @@ -225,7 +225,7 @@ "type": "t_address" }, { - "astId": 4165, + "astId": 879, "contract": "contracts/Optimism_SpokePool.sol:Optimism_SpokePool", "label": "tokenBridges", "offset": 0, @@ -233,7 +233,7 @@ "type": "t_mapping(t_address,t_address)" }, { - "astId": 4431, + "astId": 1145, "contract": "contracts/Optimism_SpokePool.sol:Optimism_SpokePool", "label": "__gap", "offset": 0, @@ -247,11 +247,11 @@ "label": "address", "numberOfBytes": "20" }, - "t_array(t_struct(RootBundle)14038_storage)dyn_storage": { + "t_array(t_struct(RootBundle)3792_storage)dyn_storage": { "encoding": "dynamic_array", "label": "struct SpokePoolInterface.RootBundle[]", "numberOfBytes": "32", - "base": "t_struct(RootBundle)14038_storage" + "base": "t_struct(RootBundle)3792_storage" }, "t_array(t_uint256)1000_storage": { "encoding": "inplace", @@ -287,7 +287,7 @@ "label": "bytes32", "numberOfBytes": "32" }, - "t_contract(WETH9Interface)13461": { + "t_contract(WETH9Interface)3527": { "encoding": "inplace", "label": "contract WETH9Interface", "numberOfBytes": "20" @@ -334,13 +334,13 @@ "numberOfBytes": "32", "value": "t_uint256" }, - "t_struct(RootBundle)14038_storage": { + "t_struct(RootBundle)3792_storage": { "encoding": "inplace", "label": "struct SpokePoolInterface.RootBundle", "numberOfBytes": "96", "members": [ { - "astId": 14031, + "astId": 3785, "contract": "contracts/Optimism_SpokePool.sol:Optimism_SpokePool", "label": "slowRelayRoot", "offset": 0, @@ -348,7 +348,7 @@ "type": "t_bytes32" }, { - "astId": 14033, + "astId": 3787, "contract": "contracts/Optimism_SpokePool.sol:Optimism_SpokePool", "label": "relayerRefundRoot", "offset": 0, @@ -356,7 +356,7 @@ "type": "t_bytes32" }, { - "astId": 14037, + "astId": 3791, "contract": "contracts/Optimism_SpokePool.sol:Optimism_SpokePool", "label": "claimedBitmap", "offset": 0, diff --git a/storage-layouts/Polygon_SpokePool.json b/storage-layouts/Polygon_SpokePool.json index e8a080ea4..f47c873c2 100644 --- a/storage-layouts/Polygon_SpokePool.json +++ b/storage-layouts/Polygon_SpokePool.json @@ -1,7 +1,7 @@ { "storage": [ { - "astId": 65577, + "astId": 59618, "contract": "contracts/Polygon_SpokePool.sol:Polygon_SpokePool", "label": "_initialized", "offset": 0, @@ -9,7 +9,7 @@ "type": "t_uint8" }, { - "astId": 65580, + "astId": 59621, "contract": "contracts/Polygon_SpokePool.sol:Polygon_SpokePool", "label": "_initializing", "offset": 1, @@ -17,7 +17,7 @@ "type": "t_bool" }, { - "astId": 65559, + "astId": 59600, "contract": "contracts/Polygon_SpokePool.sol:Polygon_SpokePool", "label": "__gap", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_array(t_uint256)50_storage" }, { - "astId": 65875, + "astId": 59916, "contract": "contracts/Polygon_SpokePool.sol:Polygon_SpokePool", "label": "__gap", "offset": 0, @@ -33,7 +33,7 @@ "type": "t_array(t_uint256)50_storage" }, { - "astId": 65891, + "astId": 59932, "contract": "contracts/Polygon_SpokePool.sol:Polygon_SpokePool", "label": "_status", "offset": 0, @@ -41,7 +41,7 @@ "type": "t_uint256" }, { - "astId": 65960, + "astId": 60001, "contract": "contracts/Polygon_SpokePool.sol:Polygon_SpokePool", "label": "__gap", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_array(t_uint256)49_storage" }, { - "astId": 17991, + "astId": 12251, "contract": "contracts/Polygon_SpokePool.sol:Polygon_SpokePool", "label": "__gap", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_array(t_uint256)1000_storage" }, { - "astId": 17723, + "astId": 11983, "contract": "contracts/Polygon_SpokePool.sol:Polygon_SpokePool", "label": "_HASHED_NAME", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_bytes32" }, { - "astId": 17725, + "astId": 11985, "contract": "contracts/Polygon_SpokePool.sol:Polygon_SpokePool", "label": "_HASHED_VERSION", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_bytes32" }, { - "astId": 17824, + "astId": 12084, "contract": "contracts/Polygon_SpokePool.sol:Polygon_SpokePool", "label": "__gap", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_array(t_uint256)1000_storage" }, { - "astId": 5938, + "astId": 5706, "contract": "contracts/Polygon_SpokePool.sol:Polygon_SpokePool", "label": "crossDomainAdmin", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_address" }, { - "astId": 5940, + "astId": 5708, "contract": "contracts/Polygon_SpokePool.sol:Polygon_SpokePool", "label": "hubPool", "offset": 0, @@ -97,15 +97,15 @@ "type": "t_address" }, { - "astId": 5943, + "astId": 5711, "contract": "contracts/Polygon_SpokePool.sol:Polygon_SpokePool", "label": "DEPRECATED_wrappedNativeToken", "offset": 0, "slot": "2155", - "type": "t_contract(WETH9Interface)13461" + "type": "t_contract(WETH9Interface)9058" }, { - "astId": 5945, + "astId": 5713, "contract": "contracts/Polygon_SpokePool.sol:Polygon_SpokePool", "label": "DEPRECATED_depositQuoteTimeBuffer", "offset": 20, @@ -113,7 +113,7 @@ "type": "t_uint32" }, { - "astId": 5947, + "astId": 5715, "contract": "contracts/Polygon_SpokePool.sol:Polygon_SpokePool", "label": "numberOfDeposits", "offset": 24, @@ -121,7 +121,7 @@ "type": "t_uint32" }, { - "astId": 5949, + "astId": 5717, "contract": "contracts/Polygon_SpokePool.sol:Polygon_SpokePool", "label": "pausedFills", "offset": 28, @@ -129,7 +129,7 @@ "type": "t_bool" }, { - "astId": 5951, + "astId": 5719, "contract": "contracts/Polygon_SpokePool.sol:Polygon_SpokePool", "label": "pausedDeposits", "offset": 29, @@ -137,15 +137,15 @@ "type": "t_bool" }, { - "astId": 5955, + "astId": 5723, "contract": "contracts/Polygon_SpokePool.sol:Polygon_SpokePool", "label": "rootBundles", "offset": 0, "slot": "2156", - "type": "t_array(t_struct(RootBundle)14038_storage)dyn_storage" + "type": "t_array(t_struct(RootBundle)9635_storage)dyn_storage" }, { - "astId": 5961, + "astId": 5729, "contract": "contracts/Polygon_SpokePool.sol:Polygon_SpokePool", "label": "enabledDepositRoutes", "offset": 0, @@ -153,7 +153,7 @@ "type": "t_mapping(t_address,t_mapping(t_uint256,t_bool))" }, { - "astId": 5965, + "astId": 5733, "contract": "contracts/Polygon_SpokePool.sol:Polygon_SpokePool", "label": "DEPRECATED_relayFills", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_mapping(t_bytes32,t_uint256)" }, { - "astId": 5969, + "astId": 5737, "contract": "contracts/Polygon_SpokePool.sol:Polygon_SpokePool", "label": "DEPRECATED_fillCounter", "offset": 0, @@ -169,7 +169,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5973, + "astId": 5741, "contract": "contracts/Polygon_SpokePool.sol:Polygon_SpokePool", "label": "DEPRECATED_depositCounter", "offset": 0, @@ -177,7 +177,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5977, + "astId": 5745, "contract": "contracts/Polygon_SpokePool.sol:Polygon_SpokePool", "label": "DEPRECATED_refundsRequested", "offset": 0, @@ -185,7 +185,7 @@ "type": "t_mapping(t_bytes32,t_uint256)" }, { - "astId": 5981, + "astId": 5749, "contract": "contracts/Polygon_SpokePool.sol:Polygon_SpokePool", "label": "fillStatuses", "offset": 0, @@ -193,7 +193,7 @@ "type": "t_mapping(t_bytes32,t_uint256)" }, { - "astId": 7882, + "astId": 7650, "contract": "contracts/Polygon_SpokePool.sol:Polygon_SpokePool", "label": "__gap", "offset": 0, @@ -201,7 +201,7 @@ "type": "t_array(t_uint256)999_storage" }, { - "astId": 5257, + "astId": 5025, "contract": "contracts/Polygon_SpokePool.sol:Polygon_SpokePool", "label": "fxChild", "offset": 0, @@ -209,15 +209,15 @@ "type": "t_address" }, { - "astId": 5260, + "astId": 5028, "contract": "contracts/Polygon_SpokePool.sol:Polygon_SpokePool", "label": "polygonTokenBridger", "offset": 0, "slot": "3163", - "type": "t_contract(PolygonTokenBridger)4888" + "type": "t_contract(PolygonTokenBridger)4656" }, { - "astId": 5262, + "astId": 5030, "contract": "contracts/Polygon_SpokePool.sol:Polygon_SpokePool", "label": "callValidated", "offset": 20, @@ -231,11 +231,11 @@ "label": "address", "numberOfBytes": "20" }, - "t_array(t_struct(RootBundle)14038_storage)dyn_storage": { + "t_array(t_struct(RootBundle)9635_storage)dyn_storage": { "encoding": "dynamic_array", "label": "struct SpokePoolInterface.RootBundle[]", "numberOfBytes": "32", - "base": "t_struct(RootBundle)14038_storage" + "base": "t_struct(RootBundle)9635_storage" }, "t_array(t_uint256)1000_storage": { "encoding": "inplace", @@ -271,12 +271,12 @@ "label": "bytes32", "numberOfBytes": "32" }, - "t_contract(PolygonTokenBridger)4888": { + "t_contract(PolygonTokenBridger)4656": { "encoding": "inplace", "label": "contract PolygonTokenBridger", "numberOfBytes": "20" }, - "t_contract(WETH9Interface)13461": { + "t_contract(WETH9Interface)9058": { "encoding": "inplace", "label": "contract WETH9Interface", "numberOfBytes": "20" @@ -316,13 +316,13 @@ "numberOfBytes": "32", "value": "t_uint256" }, - "t_struct(RootBundle)14038_storage": { + "t_struct(RootBundle)9635_storage": { "encoding": "inplace", "label": "struct SpokePoolInterface.RootBundle", "numberOfBytes": "96", "members": [ { - "astId": 14031, + "astId": 9628, "contract": "contracts/Polygon_SpokePool.sol:Polygon_SpokePool", "label": "slowRelayRoot", "offset": 0, @@ -330,7 +330,7 @@ "type": "t_bytes32" }, { - "astId": 14033, + "astId": 9630, "contract": "contracts/Polygon_SpokePool.sol:Polygon_SpokePool", "label": "relayerRefundRoot", "offset": 0, @@ -338,7 +338,7 @@ "type": "t_bytes32" }, { - "astId": 14037, + "astId": 9634, "contract": "contracts/Polygon_SpokePool.sol:Polygon_SpokePool", "label": "claimedBitmap", "offset": 0, diff --git a/storage-layouts/ZkSync_SpokePool.json b/storage-layouts/ZkSync_SpokePool.json index 19a26186c..ae47cdcaf 100644 --- a/storage-layouts/ZkSync_SpokePool.json +++ b/storage-layouts/ZkSync_SpokePool.json @@ -1,7 +1,7 @@ { "storage": [ { - "astId": 65577, + "astId": 59618, "contract": "contracts/ZkSync_SpokePool.sol:ZkSync_SpokePool", "label": "_initialized", "offset": 0, @@ -9,7 +9,7 @@ "type": "t_uint8" }, { - "astId": 65580, + "astId": 59621, "contract": "contracts/ZkSync_SpokePool.sol:ZkSync_SpokePool", "label": "_initializing", "offset": 1, @@ -17,7 +17,7 @@ "type": "t_bool" }, { - "astId": 65559, + "astId": 59600, "contract": "contracts/ZkSync_SpokePool.sol:ZkSync_SpokePool", "label": "__gap", "offset": 0, @@ -25,7 +25,7 @@ "type": "t_array(t_uint256)50_storage" }, { - "astId": 65875, + "astId": 59916, "contract": "contracts/ZkSync_SpokePool.sol:ZkSync_SpokePool", "label": "__gap", "offset": 0, @@ -33,7 +33,7 @@ "type": "t_array(t_uint256)50_storage" }, { - "astId": 65891, + "astId": 59932, "contract": "contracts/ZkSync_SpokePool.sol:ZkSync_SpokePool", "label": "_status", "offset": 0, @@ -41,7 +41,7 @@ "type": "t_uint256" }, { - "astId": 65960, + "astId": 60001, "contract": "contracts/ZkSync_SpokePool.sol:ZkSync_SpokePool", "label": "__gap", "offset": 0, @@ -49,7 +49,7 @@ "type": "t_array(t_uint256)49_storage" }, { - "astId": 17991, + "astId": 12251, "contract": "contracts/ZkSync_SpokePool.sol:ZkSync_SpokePool", "label": "__gap", "offset": 0, @@ -57,7 +57,7 @@ "type": "t_array(t_uint256)1000_storage" }, { - "astId": 17723, + "astId": 11983, "contract": "contracts/ZkSync_SpokePool.sol:ZkSync_SpokePool", "label": "_HASHED_NAME", "offset": 0, @@ -65,7 +65,7 @@ "type": "t_bytes32" }, { - "astId": 17725, + "astId": 11985, "contract": "contracts/ZkSync_SpokePool.sol:ZkSync_SpokePool", "label": "_HASHED_VERSION", "offset": 0, @@ -73,7 +73,7 @@ "type": "t_bytes32" }, { - "astId": 17824, + "astId": 12084, "contract": "contracts/ZkSync_SpokePool.sol:ZkSync_SpokePool", "label": "__gap", "offset": 0, @@ -81,7 +81,7 @@ "type": "t_array(t_uint256)1000_storage" }, { - "astId": 5938, + "astId": 5706, "contract": "contracts/ZkSync_SpokePool.sol:ZkSync_SpokePool", "label": "crossDomainAdmin", "offset": 0, @@ -89,7 +89,7 @@ "type": "t_address" }, { - "astId": 5940, + "astId": 5708, "contract": "contracts/ZkSync_SpokePool.sol:ZkSync_SpokePool", "label": "hubPool", "offset": 0, @@ -97,15 +97,15 @@ "type": "t_address" }, { - "astId": 5943, + "astId": 5711, "contract": "contracts/ZkSync_SpokePool.sol:ZkSync_SpokePool", "label": "DEPRECATED_wrappedNativeToken", "offset": 0, "slot": "2155", - "type": "t_contract(WETH9Interface)13461" + "type": "t_contract(WETH9Interface)9058" }, { - "astId": 5945, + "astId": 5713, "contract": "contracts/ZkSync_SpokePool.sol:ZkSync_SpokePool", "label": "DEPRECATED_depositQuoteTimeBuffer", "offset": 20, @@ -113,7 +113,7 @@ "type": "t_uint32" }, { - "astId": 5947, + "astId": 5715, "contract": "contracts/ZkSync_SpokePool.sol:ZkSync_SpokePool", "label": "numberOfDeposits", "offset": 24, @@ -121,7 +121,7 @@ "type": "t_uint32" }, { - "astId": 5949, + "astId": 5717, "contract": "contracts/ZkSync_SpokePool.sol:ZkSync_SpokePool", "label": "pausedFills", "offset": 28, @@ -129,7 +129,7 @@ "type": "t_bool" }, { - "astId": 5951, + "astId": 5719, "contract": "contracts/ZkSync_SpokePool.sol:ZkSync_SpokePool", "label": "pausedDeposits", "offset": 29, @@ -137,15 +137,15 @@ "type": "t_bool" }, { - "astId": 5955, + "astId": 5723, "contract": "contracts/ZkSync_SpokePool.sol:ZkSync_SpokePool", "label": "rootBundles", "offset": 0, "slot": "2156", - "type": "t_array(t_struct(RootBundle)14038_storage)dyn_storage" + "type": "t_array(t_struct(RootBundle)9635_storage)dyn_storage" }, { - "astId": 5961, + "astId": 5729, "contract": "contracts/ZkSync_SpokePool.sol:ZkSync_SpokePool", "label": "enabledDepositRoutes", "offset": 0, @@ -153,7 +153,7 @@ "type": "t_mapping(t_address,t_mapping(t_uint256,t_bool))" }, { - "astId": 5965, + "astId": 5733, "contract": "contracts/ZkSync_SpokePool.sol:ZkSync_SpokePool", "label": "DEPRECATED_relayFills", "offset": 0, @@ -161,7 +161,7 @@ "type": "t_mapping(t_bytes32,t_uint256)" }, { - "astId": 5969, + "astId": 5737, "contract": "contracts/ZkSync_SpokePool.sol:ZkSync_SpokePool", "label": "DEPRECATED_fillCounter", "offset": 0, @@ -169,7 +169,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5973, + "astId": 5741, "contract": "contracts/ZkSync_SpokePool.sol:ZkSync_SpokePool", "label": "DEPRECATED_depositCounter", "offset": 0, @@ -177,7 +177,7 @@ "type": "t_mapping(t_address,t_uint256)" }, { - "astId": 5977, + "astId": 5745, "contract": "contracts/ZkSync_SpokePool.sol:ZkSync_SpokePool", "label": "DEPRECATED_refundsRequested", "offset": 0, @@ -185,7 +185,7 @@ "type": "t_mapping(t_bytes32,t_uint256)" }, { - "astId": 5981, + "astId": 5749, "contract": "contracts/ZkSync_SpokePool.sol:ZkSync_SpokePool", "label": "fillStatuses", "offset": 0, @@ -193,7 +193,7 @@ "type": "t_mapping(t_bytes32,t_uint256)" }, { - "astId": 7882, + "astId": 7650, "contract": "contracts/ZkSync_SpokePool.sol:ZkSync_SpokePool", "label": "__gap", "offset": 0, @@ -201,7 +201,7 @@ "type": "t_array(t_uint256)999_storage" }, { - "astId": 8611, + "astId": 7865, "contract": "contracts/ZkSync_SpokePool.sol:ZkSync_SpokePool", "label": "l2Eth", "offset": 0, @@ -209,12 +209,12 @@ "type": "t_address" }, { - "astId": 8614, + "astId": 7868, "contract": "contracts/ZkSync_SpokePool.sol:ZkSync_SpokePool", "label": "zkErc20Bridge", "offset": 0, "slot": "3163", - "type": "t_contract(ZkBridgeLike)8600" + "type": "t_contract(ZkBridgeLike)7854" } ], "types": { @@ -223,11 +223,11 @@ "label": "address", "numberOfBytes": "20" }, - "t_array(t_struct(RootBundle)14038_storage)dyn_storage": { + "t_array(t_struct(RootBundle)9635_storage)dyn_storage": { "encoding": "dynamic_array", "label": "struct SpokePoolInterface.RootBundle[]", "numberOfBytes": "32", - "base": "t_struct(RootBundle)14038_storage" + "base": "t_struct(RootBundle)9635_storage" }, "t_array(t_uint256)1000_storage": { "encoding": "inplace", @@ -263,12 +263,12 @@ "label": "bytes32", "numberOfBytes": "32" }, - "t_contract(WETH9Interface)13461": { + "t_contract(WETH9Interface)9058": { "encoding": "inplace", "label": "contract WETH9Interface", "numberOfBytes": "20" }, - "t_contract(ZkBridgeLike)8600": { + "t_contract(ZkBridgeLike)7854": { "encoding": "inplace", "label": "contract ZkBridgeLike", "numberOfBytes": "20" @@ -308,13 +308,13 @@ "numberOfBytes": "32", "value": "t_uint256" }, - "t_struct(RootBundle)14038_storage": { + "t_struct(RootBundle)9635_storage": { "encoding": "inplace", "label": "struct SpokePoolInterface.RootBundle", "numberOfBytes": "96", "members": [ { - "astId": 14031, + "astId": 9628, "contract": "contracts/ZkSync_SpokePool.sol:ZkSync_SpokePool", "label": "slowRelayRoot", "offset": 0, @@ -322,7 +322,7 @@ "type": "t_bytes32" }, { - "astId": 14033, + "astId": 9630, "contract": "contracts/ZkSync_SpokePool.sol:ZkSync_SpokePool", "label": "relayerRefundRoot", "offset": 0, @@ -330,7 +330,7 @@ "type": "t_bytes32" }, { - "astId": 14037, + "astId": 9634, "contract": "contracts/ZkSync_SpokePool.sol:ZkSync_SpokePool", "label": "claimedBitmap", "offset": 0,