From 1bd3840752f47d32778860e670ab1914e3ac5297 Mon Sep 17 00:00:00 2001 From: gzeon Date: Wed, 11 Dec 2024 14:19:54 +0800 Subject: [PATCH] update links in README.md (#277) * update links in README.md (#276) * update links in README.md * update link in README.md update link to deployed nitro contract addresses * adding #core-contracts to end of link text --------- Co-authored-by: gzeon * fix: new foundry storage format * fix: CacheManager storage --------- Co-authored-by: Allan --- README.md | 4 ++-- test/storage/Bridge | 18 ++++++++++++++- test/storage/CacheManager | 13 ++++++++++- test/storage/ChallengeManager | 12 +++++++++- test/storage/ERC20Bridge | 20 ++++++++++++++++- test/storage/ERC20Inbox | 15 ++++++++++++- test/storage/ERC20Outbox | 11 ++++++++- test/storage/Inbox | 15 ++++++++++++- test/storage/Outbox | 11 ++++++++- test/storage/RollupAdminLogic | 42 ++++++++++++++++++++++++++++++++++- test/storage/RollupCore | 42 ++++++++++++++++++++++++++++++++++- test/storage/RollupUserLogic | 42 ++++++++++++++++++++++++++++++++++- test/storage/SequencerInbox | 17 +++++++++++++- 13 files changed, 248 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index c27e3a5e4..27f0d8371 100644 --- a/README.md +++ b/README.md @@ -5,9 +5,9 @@ It includes the rollup and fraud proof smart contracts, as well as interfaces fo For more information see https://developer.arbitrum.io/intro -For the deployed addresses of these contracts for Arbitrum chains see https://developer.arbitrum.io/useful-addresses +For the deployed addresses of these contracts for Arbitrum chains see [https://docs.arbitrum.io/for-devs/dev-tools-and-resources/chain-info#core-contracts](https://docs.arbitrum.io/for-devs/dev-tools-and-resources/chain-info#core-contracts) -For the token bridge contracts see https://github.com/OffchainLabs/token-bridge-contracts +For the token bridge contracts see [https://github.com/OffchainLabs/token-bridge-contracts](https://github.com/OffchainLabs/token-bridge-contracts) Compile these contracts locally by running diff --git a/test/storage/Bridge b/test/storage/Bridge index 9ed7f48a2..6095805e7 100644 --- a/test/storage/Bridge +++ b/test/storage/Bridge @@ -1,15 +1,31 @@ + +╭----------------------------------+------------------------------------------------+------+--------+-------+------------------------------╮ | Name | Type | Slot | Offset | Bytes | Contract | -|----------------------------------|------------------------------------------------|------|--------|-------|------------------------------| ++==========================================================================================================================================+ | _initialized | bool | 0 | 0 | 1 | src/bridge/Bridge.sol:Bridge | +|----------------------------------+------------------------------------------------+------+--------+-------+------------------------------| | _initializing | bool | 0 | 1 | 1 | src/bridge/Bridge.sol:Bridge | +|----------------------------------+------------------------------------------------+------+--------+-------+------------------------------| | allowedDelayedInboxesMap | mapping(address => struct AbsBridge.InOutInfo) | 1 | 0 | 32 | src/bridge/Bridge.sol:Bridge | +|----------------------------------+------------------------------------------------+------+--------+-------+------------------------------| | allowedOutboxesMap | mapping(address => struct AbsBridge.InOutInfo) | 2 | 0 | 32 | src/bridge/Bridge.sol:Bridge | +|----------------------------------+------------------------------------------------+------+--------+-------+------------------------------| | allowedDelayedInboxList | address[] | 3 | 0 | 32 | src/bridge/Bridge.sol:Bridge | +|----------------------------------+------------------------------------------------+------+--------+-------+------------------------------| | allowedOutboxList | address[] | 4 | 0 | 32 | src/bridge/Bridge.sol:Bridge | +|----------------------------------+------------------------------------------------+------+--------+-------+------------------------------| | _activeOutbox | address | 5 | 0 | 20 | src/bridge/Bridge.sol:Bridge | +|----------------------------------+------------------------------------------------+------+--------+-------+------------------------------| | delayedInboxAccs | bytes32[] | 6 | 0 | 32 | src/bridge/Bridge.sol:Bridge | +|----------------------------------+------------------------------------------------+------+--------+-------+------------------------------| | sequencerInboxAccs | bytes32[] | 7 | 0 | 32 | src/bridge/Bridge.sol:Bridge | +|----------------------------------+------------------------------------------------+------+--------+-------+------------------------------| | rollup | contract IOwnable | 8 | 0 | 20 | src/bridge/Bridge.sol:Bridge | +|----------------------------------+------------------------------------------------+------+--------+-------+------------------------------| | sequencerInbox | address | 9 | 0 | 20 | src/bridge/Bridge.sol:Bridge | +|----------------------------------+------------------------------------------------+------+--------+-------+------------------------------| | sequencerReportedSubMessageCount | uint256 | 10 | 0 | 32 | src/bridge/Bridge.sol:Bridge | +|----------------------------------+------------------------------------------------+------+--------+-------+------------------------------| | __gap | uint256[40] | 11 | 0 | 1280 | src/bridge/Bridge.sol:Bridge | +╰----------------------------------+------------------------------------------------+------+--------+-------+------------------------------╯ + diff --git a/test/storage/CacheManager b/test/storage/CacheManager index 199a48d08..3d102ee59 100644 --- a/test/storage/CacheManager +++ b/test/storage/CacheManager @@ -1,10 +1,21 @@ + +╭---------------+-----------------------------+------+--------+-------+-----------------------------------------╮ | Name | Type | Slot | Offset | Bytes | Contract | -|---------------|-----------------------------|------|--------|-------|-----------------------------------------| ++===============================================================================================================+ | _initialized | bool | 0 | 0 | 1 | src/chain/CacheManager.sol:CacheManager | +|---------------+-----------------------------+------+--------+-------+-----------------------------------------| | _initializing | bool | 0 | 1 | 1 | src/chain/CacheManager.sol:CacheManager | +|---------------+-----------------------------+------+--------+-------+-----------------------------------------| | bids | struct MinHeapLib.Heap | 1 | 0 | 32 | src/chain/CacheManager.sol:CacheManager | +|---------------+-----------------------------+------+--------+-------+-----------------------------------------| | entries | struct CacheManager.Entry[] | 2 | 0 | 32 | src/chain/CacheManager.sol:CacheManager | +|---------------+-----------------------------+------+--------+-------+-----------------------------------------| | cacheSize | uint64 | 3 | 0 | 8 | src/chain/CacheManager.sol:CacheManager | +|---------------+-----------------------------+------+--------+-------+-----------------------------------------| | queueSize | uint64 | 3 | 8 | 8 | src/chain/CacheManager.sol:CacheManager | +|---------------+-----------------------------+------+--------+-------+-----------------------------------------| | decay | uint64 | 3 | 16 | 8 | src/chain/CacheManager.sol:CacheManager | +|---------------+-----------------------------+------+--------+-------+-----------------------------------------| | isPaused | bool | 3 | 24 | 1 | src/chain/CacheManager.sol:CacheManager | +╰---------------+-----------------------------+------+--------+-------+-----------------------------------------╯ + diff --git a/test/storage/ChallengeManager b/test/storage/ChallengeManager index 15c3f1166..2c8291997 100644 --- a/test/storage/ChallengeManager +++ b/test/storage/ChallengeManager @@ -1,9 +1,19 @@ + +╭------------------------+---------------------------------------------------+------+--------+-------+-----------------------------------------------------╮ | Name | Type | Slot | Offset | Bytes | Contract | -|------------------------|---------------------------------------------------|------|--------|-------|-----------------------------------------------------| ++==========================================================================================================================================================+ | totalChallengesCreated | uint64 | 0 | 0 | 8 | src/challenge/ChallengeManager.sol:ChallengeManager | +|------------------------+---------------------------------------------------+------+--------+-------+-----------------------------------------------------| | challenges | mapping(uint256 => struct ChallengeLib.Challenge) | 1 | 0 | 32 | src/challenge/ChallengeManager.sol:ChallengeManager | +|------------------------+---------------------------------------------------+------+--------+-------+-----------------------------------------------------| | resultReceiver | contract IChallengeResultReceiver | 2 | 0 | 20 | src/challenge/ChallengeManager.sol:ChallengeManager | +|------------------------+---------------------------------------------------+------+--------+-------+-----------------------------------------------------| | sequencerInbox | contract ISequencerInbox | 3 | 0 | 20 | src/challenge/ChallengeManager.sol:ChallengeManager | +|------------------------+---------------------------------------------------+------+--------+-------+-----------------------------------------------------| | bridge | contract IBridge | 4 | 0 | 20 | src/challenge/ChallengeManager.sol:ChallengeManager | +|------------------------+---------------------------------------------------+------+--------+-------+-----------------------------------------------------| | osp | contract IOneStepProofEntry | 5 | 0 | 20 | src/challenge/ChallengeManager.sol:ChallengeManager | +|------------------------+---------------------------------------------------+------+--------+-------+-----------------------------------------------------| | ospCond | mapping(bytes32 => contract IOneStepProofEntry) | 6 | 0 | 32 | src/challenge/ChallengeManager.sol:ChallengeManager | +╰------------------------+---------------------------------------------------+------+--------+-------+-----------------------------------------------------╯ + diff --git a/test/storage/ERC20Bridge b/test/storage/ERC20Bridge index 7e00cd683..9491fe84d 100644 --- a/test/storage/ERC20Bridge +++ b/test/storage/ERC20Bridge @@ -1,17 +1,35 @@ + +╭----------------------------------+------------------------------------------------+------+--------+-------+----------------------------------------╮ | Name | Type | Slot | Offset | Bytes | Contract | -|----------------------------------|------------------------------------------------|------|--------|-------|----------------------------------------| ++====================================================================================================================================================+ | _initialized | bool | 0 | 0 | 1 | src/bridge/ERC20Bridge.sol:ERC20Bridge | +|----------------------------------+------------------------------------------------+------+--------+-------+----------------------------------------| | _initializing | bool | 0 | 1 | 1 | src/bridge/ERC20Bridge.sol:ERC20Bridge | +|----------------------------------+------------------------------------------------+------+--------+-------+----------------------------------------| | allowedDelayedInboxesMap | mapping(address => struct AbsBridge.InOutInfo) | 1 | 0 | 32 | src/bridge/ERC20Bridge.sol:ERC20Bridge | +|----------------------------------+------------------------------------------------+------+--------+-------+----------------------------------------| | allowedOutboxesMap | mapping(address => struct AbsBridge.InOutInfo) | 2 | 0 | 32 | src/bridge/ERC20Bridge.sol:ERC20Bridge | +|----------------------------------+------------------------------------------------+------+--------+-------+----------------------------------------| | allowedDelayedInboxList | address[] | 3 | 0 | 32 | src/bridge/ERC20Bridge.sol:ERC20Bridge | +|----------------------------------+------------------------------------------------+------+--------+-------+----------------------------------------| | allowedOutboxList | address[] | 4 | 0 | 32 | src/bridge/ERC20Bridge.sol:ERC20Bridge | +|----------------------------------+------------------------------------------------+------+--------+-------+----------------------------------------| | _activeOutbox | address | 5 | 0 | 20 | src/bridge/ERC20Bridge.sol:ERC20Bridge | +|----------------------------------+------------------------------------------------+------+--------+-------+----------------------------------------| | delayedInboxAccs | bytes32[] | 6 | 0 | 32 | src/bridge/ERC20Bridge.sol:ERC20Bridge | +|----------------------------------+------------------------------------------------+------+--------+-------+----------------------------------------| | sequencerInboxAccs | bytes32[] | 7 | 0 | 32 | src/bridge/ERC20Bridge.sol:ERC20Bridge | +|----------------------------------+------------------------------------------------+------+--------+-------+----------------------------------------| | rollup | contract IOwnable | 8 | 0 | 20 | src/bridge/ERC20Bridge.sol:ERC20Bridge | +|----------------------------------+------------------------------------------------+------+--------+-------+----------------------------------------| | sequencerInbox | address | 9 | 0 | 20 | src/bridge/ERC20Bridge.sol:ERC20Bridge | +|----------------------------------+------------------------------------------------+------+--------+-------+----------------------------------------| | sequencerReportedSubMessageCount | uint256 | 10 | 0 | 32 | src/bridge/ERC20Bridge.sol:ERC20Bridge | +|----------------------------------+------------------------------------------------+------+--------+-------+----------------------------------------| | __gap | uint256[40] | 11 | 0 | 1280 | src/bridge/ERC20Bridge.sol:ERC20Bridge | +|----------------------------------+------------------------------------------------+------+--------+-------+----------------------------------------| | nativeToken | address | 51 | 0 | 20 | src/bridge/ERC20Bridge.sol:ERC20Bridge | +|----------------------------------+------------------------------------------------+------+--------+-------+----------------------------------------| | nativeTokenDecimals | uint8 | 51 | 20 | 1 | src/bridge/ERC20Bridge.sol:ERC20Bridge | +╰----------------------------------+------------------------------------------------+------+--------+-------+----------------------------------------╯ + diff --git a/test/storage/ERC20Inbox b/test/storage/ERC20Inbox index 58f398df8..bb9c1ba6c 100644 --- a/test/storage/ERC20Inbox +++ b/test/storage/ERC20Inbox @@ -1,12 +1,25 @@ + +╭------------------+--------------------------+------+--------+-------+--------------------------------------╮ | Name | Type | Slot | Offset | Bytes | Contract | -|------------------|--------------------------|------|--------|-------|--------------------------------------| ++============================================================================================================+ | _initialized | bool | 0 | 0 | 1 | src/bridge/ERC20Inbox.sol:ERC20Inbox | +|------------------+--------------------------+------+--------+-------+--------------------------------------| | _initializing | bool | 0 | 1 | 1 | src/bridge/ERC20Inbox.sol:ERC20Inbox | +|------------------+--------------------------+------+--------+-------+--------------------------------------| | __gap | uint256[50] | 1 | 0 | 1600 | src/bridge/ERC20Inbox.sol:ERC20Inbox | +|------------------+--------------------------+------+--------+-------+--------------------------------------| | _paused | bool | 51 | 0 | 1 | src/bridge/ERC20Inbox.sol:ERC20Inbox | +|------------------+--------------------------+------+--------+-------+--------------------------------------| | __gap | uint256[49] | 52 | 0 | 1568 | src/bridge/ERC20Inbox.sol:ERC20Inbox | +|------------------+--------------------------+------+--------+-------+--------------------------------------| | bridge | contract IBridge | 101 | 0 | 20 | src/bridge/ERC20Inbox.sol:ERC20Inbox | +|------------------+--------------------------+------+--------+-------+--------------------------------------| | sequencerInbox | contract ISequencerInbox | 102 | 0 | 20 | src/bridge/ERC20Inbox.sol:ERC20Inbox | +|------------------+--------------------------+------+--------+-------+--------------------------------------| | allowListEnabled | bool | 102 | 20 | 1 | src/bridge/ERC20Inbox.sol:ERC20Inbox | +|------------------+--------------------------+------+--------+-------+--------------------------------------| | isAllowed | mapping(address => bool) | 103 | 0 | 32 | src/bridge/ERC20Inbox.sol:ERC20Inbox | +|------------------+--------------------------+------+--------+-------+--------------------------------------| | __gap | uint256[47] | 104 | 0 | 1504 | src/bridge/ERC20Inbox.sol:ERC20Inbox | +╰------------------+--------------------------+------+--------+-------+--------------------------------------╯ + diff --git a/test/storage/ERC20Outbox b/test/storage/ERC20Outbox index 09e2c38cb..ddd0b5fef 100644 --- a/test/storage/ERC20Outbox +++ b/test/storage/ERC20Outbox @@ -1,8 +1,17 @@ + +╭---------+--------------------------------+------+--------+-------+----------------------------------------╮ | Name | Type | Slot | Offset | Bytes | Contract | -|---------|--------------------------------|------|--------|-------|----------------------------------------| ++===========================================================================================================+ | rollup | address | 0 | 0 | 20 | src/bridge/ERC20Outbox.sol:ERC20Outbox | +|---------+--------------------------------+------+--------+-------+----------------------------------------| | bridge | contract IBridge | 1 | 0 | 20 | src/bridge/ERC20Outbox.sol:ERC20Outbox | +|---------+--------------------------------+------+--------+-------+----------------------------------------| | spent | mapping(uint256 => bytes32) | 2 | 0 | 32 | src/bridge/ERC20Outbox.sol:ERC20Outbox | +|---------+--------------------------------+------+--------+-------+----------------------------------------| | roots | mapping(bytes32 => bytes32) | 3 | 0 | 32 | src/bridge/ERC20Outbox.sol:ERC20Outbox | +|---------+--------------------------------+------+--------+-------+----------------------------------------| | context | struct AbsOutbox.L2ToL1Context | 4 | 0 | 128 | src/bridge/ERC20Outbox.sol:ERC20Outbox | +|---------+--------------------------------+------+--------+-------+----------------------------------------| | __gap | uint256[42] | 8 | 0 | 1344 | src/bridge/ERC20Outbox.sol:ERC20Outbox | +╰---------+--------------------------------+------+--------+-------+----------------------------------------╯ + diff --git a/test/storage/Inbox b/test/storage/Inbox index 0551822e3..8e38f6ae7 100644 --- a/test/storage/Inbox +++ b/test/storage/Inbox @@ -1,12 +1,25 @@ + +╭------------------+--------------------------+------+--------+-------+----------------------------╮ | Name | Type | Slot | Offset | Bytes | Contract | -|------------------|--------------------------|------|--------|-------|----------------------------| ++==================================================================================================+ | _initialized | bool | 0 | 0 | 1 | src/bridge/Inbox.sol:Inbox | +|------------------+--------------------------+------+--------+-------+----------------------------| | _initializing | bool | 0 | 1 | 1 | src/bridge/Inbox.sol:Inbox | +|------------------+--------------------------+------+--------+-------+----------------------------| | __gap | uint256[50] | 1 | 0 | 1600 | src/bridge/Inbox.sol:Inbox | +|------------------+--------------------------+------+--------+-------+----------------------------| | _paused | bool | 51 | 0 | 1 | src/bridge/Inbox.sol:Inbox | +|------------------+--------------------------+------+--------+-------+----------------------------| | __gap | uint256[49] | 52 | 0 | 1568 | src/bridge/Inbox.sol:Inbox | +|------------------+--------------------------+------+--------+-------+----------------------------| | bridge | contract IBridge | 101 | 0 | 20 | src/bridge/Inbox.sol:Inbox | +|------------------+--------------------------+------+--------+-------+----------------------------| | sequencerInbox | contract ISequencerInbox | 102 | 0 | 20 | src/bridge/Inbox.sol:Inbox | +|------------------+--------------------------+------+--------+-------+----------------------------| | allowListEnabled | bool | 102 | 20 | 1 | src/bridge/Inbox.sol:Inbox | +|------------------+--------------------------+------+--------+-------+----------------------------| | isAllowed | mapping(address => bool) | 103 | 0 | 32 | src/bridge/Inbox.sol:Inbox | +|------------------+--------------------------+------+--------+-------+----------------------------| | __gap | uint256[47] | 104 | 0 | 1504 | src/bridge/Inbox.sol:Inbox | +╰------------------+--------------------------+------+--------+-------+----------------------------╯ + diff --git a/test/storage/Outbox b/test/storage/Outbox index d161ae3be..854a39c92 100644 --- a/test/storage/Outbox +++ b/test/storage/Outbox @@ -1,8 +1,17 @@ + +╭---------+--------------------------------+------+--------+-------+------------------------------╮ | Name | Type | Slot | Offset | Bytes | Contract | -|---------|--------------------------------|------|--------|-------|------------------------------| ++=================================================================================================+ | rollup | address | 0 | 0 | 20 | src/bridge/Outbox.sol:Outbox | +|---------+--------------------------------+------+--------+-------+------------------------------| | bridge | contract IBridge | 1 | 0 | 20 | src/bridge/Outbox.sol:Outbox | +|---------+--------------------------------+------+--------+-------+------------------------------| | spent | mapping(uint256 => bytes32) | 2 | 0 | 32 | src/bridge/Outbox.sol:Outbox | +|---------+--------------------------------+------+--------+-------+------------------------------| | roots | mapping(bytes32 => bytes32) | 3 | 0 | 32 | src/bridge/Outbox.sol:Outbox | +|---------+--------------------------------+------+--------+-------+------------------------------| | context | struct AbsOutbox.L2ToL1Context | 4 | 0 | 128 | src/bridge/Outbox.sol:Outbox | +|---------+--------------------------------+------+--------+-------+------------------------------| | __gap | uint256[42] | 8 | 0 | 1344 | src/bridge/Outbox.sol:Outbox | +╰---------+--------------------------------+------+--------+-------+------------------------------╯ + diff --git a/test/storage/RollupAdminLogic b/test/storage/RollupAdminLogic index 8e3dc844e..331b0b6ce 100644 --- a/test/storage/RollupAdminLogic +++ b/test/storage/RollupAdminLogic @@ -1,39 +1,79 @@ + +╭----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------╮ | Name | Type | Slot | Offset | Bytes | Contract | -|----------------------------|-----------------------------------------------|------|--------|-------|--------------------------------------------------| ++=======================================================================================================================================================+ | _initialized | bool | 0 | 0 | 1 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | _initializing | bool | 0 | 1 | 1 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | __gap | uint256[50] | 1 | 0 | 1600 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | _paused | bool | 51 | 0 | 1 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | __gap | uint256[49] | 52 | 0 | 1568 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | confirmPeriodBlocks | uint64 | 101 | 0 | 8 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | extraChallengeTimeBlocks | uint64 | 101 | 8 | 8 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | chainId | uint256 | 102 | 0 | 32 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | baseStake | uint256 | 103 | 0 | 32 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | wasmModuleRoot | bytes32 | 104 | 0 | 32 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | inbox | contract IInboxBase | 105 | 0 | 20 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | bridge | contract IBridge | 106 | 0 | 20 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | outbox | contract IOutbox | 107 | 0 | 20 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | sequencerInbox | contract ISequencerInbox | 108 | 0 | 20 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | rollupEventInbox | contract IRollupEventInbox | 109 | 0 | 20 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | challengeManager | contract IChallengeManager | 110 | 0 | 20 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | validatorUtils | address | 111 | 0 | 20 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | validatorWalletCreator | address | 112 | 0 | 20 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | loserStakeEscrow | address | 113 | 0 | 20 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | stakeToken | address | 114 | 0 | 20 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | minimumAssertionPeriod | uint256 | 115 | 0 | 32 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | isValidator | mapping(address => bool) | 116 | 0 | 32 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | _latestConfirmed | uint64 | 117 | 0 | 8 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | _firstUnresolvedNode | uint64 | 117 | 8 | 8 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | _latestNodeCreated | uint64 | 117 | 16 | 8 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | _lastStakeBlock | uint64 | 117 | 24 | 8 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | _nodes | mapping(uint64 => struct Node) | 118 | 0 | 32 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | _nodeStakers | mapping(uint64 => mapping(address => bool)) | 119 | 0 | 32 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | _stakerList | address[] | 120 | 0 | 32 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | _stakerMap | mapping(address => struct IRollupCore.Staker) | 121 | 0 | 32 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | _zombies | struct RollupCore.Zombie[] | 122 | 0 | 32 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | _withdrawableFunds | mapping(address => uint256) | 123 | 0 | 32 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | totalWithdrawableFunds | uint256 | 124 | 0 | 32 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | rollupDeploymentBlock | uint256 | 125 | 0 | 32 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | validatorWhitelistDisabled | bool | 126 | 0 | 1 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | anyTrustFastConfirmer | address | 126 | 1 | 20 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------| | _nodeCreatedAtArbSysBlock | mapping(uint64 => uint256) | 127 | 0 | 32 | src/rollup/RollupAdminLogic.sol:RollupAdminLogic | +╰----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------------------╯ + diff --git a/test/storage/RollupCore b/test/storage/RollupCore index 1349cece2..b2a9cb603 100644 --- a/test/storage/RollupCore +++ b/test/storage/RollupCore @@ -1,39 +1,79 @@ + +╭----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------╮ | Name | Type | Slot | Offset | Bytes | Contract | -|----------------------------|-----------------------------------------------|------|--------|-------|--------------------------------------| ++===========================================================================================================================================+ | _initialized | bool | 0 | 0 | 1 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | _initializing | bool | 0 | 1 | 1 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | __gap | uint256[50] | 1 | 0 | 1600 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | _paused | bool | 51 | 0 | 1 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | __gap | uint256[49] | 52 | 0 | 1568 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | confirmPeriodBlocks | uint64 | 101 | 0 | 8 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | extraChallengeTimeBlocks | uint64 | 101 | 8 | 8 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | chainId | uint256 | 102 | 0 | 32 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | baseStake | uint256 | 103 | 0 | 32 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | wasmModuleRoot | bytes32 | 104 | 0 | 32 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | inbox | contract IInboxBase | 105 | 0 | 20 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | bridge | contract IBridge | 106 | 0 | 20 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | outbox | contract IOutbox | 107 | 0 | 20 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | sequencerInbox | contract ISequencerInbox | 108 | 0 | 20 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | rollupEventInbox | contract IRollupEventInbox | 109 | 0 | 20 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | challengeManager | contract IChallengeManager | 110 | 0 | 20 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | validatorUtils | address | 111 | 0 | 20 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | validatorWalletCreator | address | 112 | 0 | 20 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | loserStakeEscrow | address | 113 | 0 | 20 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | stakeToken | address | 114 | 0 | 20 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | minimumAssertionPeriod | uint256 | 115 | 0 | 32 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | isValidator | mapping(address => bool) | 116 | 0 | 32 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | _latestConfirmed | uint64 | 117 | 0 | 8 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | _firstUnresolvedNode | uint64 | 117 | 8 | 8 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | _latestNodeCreated | uint64 | 117 | 16 | 8 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | _lastStakeBlock | uint64 | 117 | 24 | 8 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | _nodes | mapping(uint64 => struct Node) | 118 | 0 | 32 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | _nodeStakers | mapping(uint64 => mapping(address => bool)) | 119 | 0 | 32 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | _stakerList | address[] | 120 | 0 | 32 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | _stakerMap | mapping(address => struct IRollupCore.Staker) | 121 | 0 | 32 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | _zombies | struct RollupCore.Zombie[] | 122 | 0 | 32 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | _withdrawableFunds | mapping(address => uint256) | 123 | 0 | 32 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | totalWithdrawableFunds | uint256 | 124 | 0 | 32 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | rollupDeploymentBlock | uint256 | 125 | 0 | 32 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | validatorWhitelistDisabled | bool | 126 | 0 | 1 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | anyTrustFastConfirmer | address | 126 | 1 | 20 | src/rollup/RollupCore.sol:RollupCore | +|----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------| | _nodeCreatedAtArbSysBlock | mapping(uint64 => uint256) | 127 | 0 | 32 | src/rollup/RollupCore.sol:RollupCore | +╰----------------------------+-----------------------------------------------+------+--------+-------+--------------------------------------╯ + diff --git a/test/storage/RollupUserLogic b/test/storage/RollupUserLogic index 5fd459185..83c824f24 100644 --- a/test/storage/RollupUserLogic +++ b/test/storage/RollupUserLogic @@ -1,39 +1,79 @@ + +╭----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------╮ | Name | Type | Slot | Offset | Bytes | Contract | -|----------------------------|-----------------------------------------------|------|--------|-------|------------------------------------------------| ++=====================================================================================================================================================+ | _initialized | bool | 0 | 0 | 1 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | _initializing | bool | 0 | 1 | 1 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | __gap | uint256[50] | 1 | 0 | 1600 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | _paused | bool | 51 | 0 | 1 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | __gap | uint256[49] | 52 | 0 | 1568 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | confirmPeriodBlocks | uint64 | 101 | 0 | 8 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | extraChallengeTimeBlocks | uint64 | 101 | 8 | 8 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | chainId | uint256 | 102 | 0 | 32 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | baseStake | uint256 | 103 | 0 | 32 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | wasmModuleRoot | bytes32 | 104 | 0 | 32 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | inbox | contract IInboxBase | 105 | 0 | 20 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | bridge | contract IBridge | 106 | 0 | 20 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | outbox | contract IOutbox | 107 | 0 | 20 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | sequencerInbox | contract ISequencerInbox | 108 | 0 | 20 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | rollupEventInbox | contract IRollupEventInbox | 109 | 0 | 20 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | challengeManager | contract IChallengeManager | 110 | 0 | 20 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | validatorUtils | address | 111 | 0 | 20 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | validatorWalletCreator | address | 112 | 0 | 20 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | loserStakeEscrow | address | 113 | 0 | 20 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | stakeToken | address | 114 | 0 | 20 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | minimumAssertionPeriod | uint256 | 115 | 0 | 32 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | isValidator | mapping(address => bool) | 116 | 0 | 32 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | _latestConfirmed | uint64 | 117 | 0 | 8 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | _firstUnresolvedNode | uint64 | 117 | 8 | 8 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | _latestNodeCreated | uint64 | 117 | 16 | 8 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | _lastStakeBlock | uint64 | 117 | 24 | 8 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | _nodes | mapping(uint64 => struct Node) | 118 | 0 | 32 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | _nodeStakers | mapping(uint64 => mapping(address => bool)) | 119 | 0 | 32 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | _stakerList | address[] | 120 | 0 | 32 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | _stakerMap | mapping(address => struct IRollupCore.Staker) | 121 | 0 | 32 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | _zombies | struct RollupCore.Zombie[] | 122 | 0 | 32 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | _withdrawableFunds | mapping(address => uint256) | 123 | 0 | 32 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | totalWithdrawableFunds | uint256 | 124 | 0 | 32 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | rollupDeploymentBlock | uint256 | 125 | 0 | 32 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | validatorWhitelistDisabled | bool | 126 | 0 | 1 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | anyTrustFastConfirmer | address | 126 | 1 | 20 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +|----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------| | _nodeCreatedAtArbSysBlock | mapping(uint64 => uint256) | 127 | 0 | 32 | src/rollup/RollupUserLogic.sol:RollupUserLogic | +╰----------------------------+-----------------------------------------------+------+--------+-------+------------------------------------------------╯ + diff --git a/test/storage/SequencerInbox b/test/storage/SequencerInbox index c53e775e3..de3c180b6 100644 --- a/test/storage/SequencerInbox +++ b/test/storage/SequencerInbox @@ -1,14 +1,29 @@ + +╭-----------------------------+----------------------------------------------------------+------+--------+-------+----------------------------------------------╮ | Name | Type | Slot | Offset | Bytes | Contract | -|-----------------------------|----------------------------------------------------------|------|--------|-------|----------------------------------------------| ++===============================================================================================================================================================+ | totalDelayedMessagesRead | uint256 | 0 | 0 | 32 | src/bridge/SequencerInbox.sol:SequencerInbox | +|-----------------------------+----------------------------------------------------------+------+--------+-------+----------------------------------------------| | bridge | contract IBridge | 1 | 0 | 20 | src/bridge/SequencerInbox.sol:SequencerInbox | +|-----------------------------+----------------------------------------------------------+------+--------+-------+----------------------------------------------| | rollup | contract IOwnable | 2 | 0 | 20 | src/bridge/SequencerInbox.sol:SequencerInbox | +|-----------------------------+----------------------------------------------------------+------+--------+-------+----------------------------------------------| | isBatchPoster | mapping(address => bool) | 3 | 0 | 32 | src/bridge/SequencerInbox.sol:SequencerInbox | +|-----------------------------+----------------------------------------------------------+------+--------+-------+----------------------------------------------| | __LEGACY_MAX_TIME_VARIATION | struct ISequencerInbox.MaxTimeVariation | 4 | 0 | 128 | src/bridge/SequencerInbox.sol:SequencerInbox | +|-----------------------------+----------------------------------------------------------+------+--------+-------+----------------------------------------------| | dasKeySetInfo | mapping(bytes32 => struct ISequencerInbox.DasKeySetInfo) | 8 | 0 | 32 | src/bridge/SequencerInbox.sol:SequencerInbox | +|-----------------------------+----------------------------------------------------------+------+--------+-------+----------------------------------------------| | isSequencer | mapping(address => bool) | 9 | 0 | 32 | src/bridge/SequencerInbox.sol:SequencerInbox | +|-----------------------------+----------------------------------------------------------+------+--------+-------+----------------------------------------------| | delayBlocks | uint64 | 10 | 0 | 8 | src/bridge/SequencerInbox.sol:SequencerInbox | +|-----------------------------+----------------------------------------------------------+------+--------+-------+----------------------------------------------| | futureBlocks | uint64 | 10 | 8 | 8 | src/bridge/SequencerInbox.sol:SequencerInbox | +|-----------------------------+----------------------------------------------------------+------+--------+-------+----------------------------------------------| | delaySeconds | uint64 | 10 | 16 | 8 | src/bridge/SequencerInbox.sol:SequencerInbox | +|-----------------------------+----------------------------------------------------------+------+--------+-------+----------------------------------------------| | futureSeconds | uint64 | 10 | 24 | 8 | src/bridge/SequencerInbox.sol:SequencerInbox | +|-----------------------------+----------------------------------------------------------+------+--------+-------+----------------------------------------------| | batchPosterManager | address | 11 | 0 | 20 | src/bridge/SequencerInbox.sol:SequencerInbox | +╰-----------------------------+----------------------------------------------------------+------+--------+-------+----------------------------------------------╯ +