Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nebula
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
exchain
nebula
Commits
d61365aa
Unverified
Commit
d61365aa
authored
Sep 10, 2022
by
Mark Tyneway
Committed by
GitHub
Sep 10, 2022
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into rollup-client-move
parents
d335e423
2687c7c4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
47 additions
and
42 deletions
+47
-42
engine_queue.go
op-node/rollup/derive/engine_queue.go
+1
-0
.storage-layout
packages/contracts-bedrock/.storage-layout
+46
-42
No files found.
op-node/rollup/derive/engine_queue.go
View file @
d61365aa
...
@@ -10,6 +10,7 @@ import (
...
@@ -10,6 +10,7 @@ import (
"github.com/ethereum-optimism/optimism/op-node/eth"
"github.com/ethereum-optimism/optimism/op-node/eth"
"github.com/ethereum-optimism/optimism/op-node/rollup"
"github.com/ethereum-optimism/optimism/op-node/rollup"
"github.com/ethereum-optimism/optimism/op-node/rollup/sync"
"github.com/ethereum-optimism/optimism/op-node/rollup/sync"
"github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/core/types"
...
...
packages/contracts-bedrock/.storage-layout
View file @
d61365aa
...
@@ -9,9 +9,11 @@
...
@@ -9,9 +9,11 @@
+------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------+
+------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------+
| Name | Type | Slot | Offset | Bytes | Contract |
| Name | Type | Slot | Offset | Bytes | Contract |
+============================================================================================================================================+
+============================================================================================================================================+
|
_initialized | uint8 | 0 | 0 | 1
| contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
|
spacer0 | address | 0 | 0 | 20
| contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
| _initializing | bool | 0 | 1 | 1 | contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
| _initialized | uint8 | 0 | 20 | 1 | contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
| _initializing | bool | 0 | 21 | 1 | contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
| __gap | uint256[50] | 1 | 0 | 1600 | contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
| __gap | uint256[50] | 1 | 0 | 1600 | contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
...
@@ -27,36 +29,36 @@
...
@@ -27,36 +29,36 @@
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
| __gap | uint256[49] | 152 | 0 | 1568 | contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
| __gap | uint256[49] | 152 | 0 | 1568 | contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
| successfulMessages | mapping(bytes32 => bool) | 201 | 0 | 32 | contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
| spacer1 | uint256 | 201 | 0 | 32 | contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
| spacer2 | uint256 | 202 | 0 | 32 | contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
|
xDomainMsgSender | address | 202 | 0 | 20
| contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
|
successfulMessages | mapping(bytes32 => bool) | 203 | 0 | 32
| contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
|
msgNonce | uint240 | 203 | 0 | 3
0 | contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
|
xDomainMsgSender | address | 204 | 0 | 2
0 | contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
|
otherMessenger | address | 204 | 0 | 2
0 | contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
|
msgNonce | uint240 | 205 | 0 | 3
0 | contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
|
receivedMessages | mapping(bytes32 => bool) | 205 | 0 | 32
| contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
|
otherMessenger | address | 206 | 0 | 20
| contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
| blockedSystemAddresses | mapping(address => bool) | 206 | 0 | 32 | contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
| receivedMessages | mapping(bytes32 => bool) | 207 | 0 | 32 | contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
| blockedSystemAddresses | mapping(address => bool) | 208 | 0 | 32 | contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger |
+------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------+
+------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------+
=======================
=======================
➡ L1StandardBridge
➡ L1StandardBridge
=======================
=======================
+----------
-----
+-------------------------------------------------+------+--------+-------+----------------------------------------------------+
+----------+-------------------------------------------------+------+--------+-------+----------------------------------------------------+
| Name | Type | Slot | Offset | Bytes | Contract |
| Name | Type | Slot | Offset | Bytes | Contract |
+==============================================================================================================================================+
+=========================================================================================================================================+
| _initialized | uint8 | 0 | 0 | 1 | contracts/L1/L1StandardBridge.sol:L1StandardBridge |
| spacer0 | uint256 | 0 | 0 | 32 | contracts/L1/L1StandardBridge.sol:L1StandardBridge |
|---------------+-------------------------------------------------+------+--------+-------+----------------------------------------------------|
|----------+-------------------------------------------------+------+--------+-------+----------------------------------------------------|
| _initializing | bool | 0 | 1 | 1 | contracts/L1/L1StandardBridge.sol:L1StandardBridge |
| spacer1 | uint256 | 1 | 0 | 32 | contracts/L1/L1StandardBridge.sol:L1StandardBridge |
|---------------+-------------------------------------------------+------+--------+-------+----------------------------------------------------|
|----------+-------------------------------------------------+------+--------+-------+----------------------------------------------------|
| messenger | contract CrossDomainMessenger | 0 | 2 | 20 | contracts/L1/L1StandardBridge.sol:L1StandardBridge |
|---------------+-------------------------------------------------+------+--------+-------+----------------------------------------------------|
| otherBridge | contract StandardBridge | 1 | 0 | 20 | contracts/L1/L1StandardBridge.sol:L1StandardBridge |
|---------------+-------------------------------------------------+------+--------+-------+----------------------------------------------------|
| deposits | mapping(address => mapping(address => uint256)) | 2 | 0 | 32 | contracts/L1/L1StandardBridge.sol:L1StandardBridge |
| deposits | mapping(address => mapping(address => uint256)) | 2 | 0 | 32 | contracts/L1/L1StandardBridge.sol:L1StandardBridge |
+----------
-----
+-------------------------------------------------+------+--------+-------+----------------------------------------------------+
+----------+-------------------------------------------------+------+--------+-------+----------------------------------------------------+
=======================
=======================
➡ L2OutputOracle
➡ L2OutputOracle
...
@@ -170,9 +172,11 @@
...
@@ -170,9 +172,11 @@
+------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------+
+------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------+
| Name | Type | Slot | Offset | Bytes | Contract |
| Name | Type | Slot | Offset | Bytes | Contract |
+============================================================================================================================================+
+============================================================================================================================================+
|
_initialized | uint8 | 0 | 0 | 1
| contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
|
spacer0 | address | 0 | 0 | 20
| contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
| _initializing | bool | 0 | 1 | 1 | contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
| _initialized | uint8 | 0 | 20 | 1 | contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
| _initializing | bool | 0 | 21 | 1 | contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
| __gap | uint256[50] | 1 | 0 | 1600 | contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
| __gap | uint256[50] | 1 | 0 | 1600 | contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
...
@@ -188,36 +192,36 @@
...
@@ -188,36 +192,36 @@
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
| __gap | uint256[49] | 152 | 0 | 1568 | contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
| __gap | uint256[49] | 152 | 0 | 1568 | contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
| successfulMessages | mapping(bytes32 => bool) | 201 | 0 | 32 | contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
| spacer1 | uint256 | 201 | 0 | 32 | contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
| spacer2 | uint256 | 202 | 0 | 32 | contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
|
xDomainMsgSender | address | 202 | 0 | 20
| contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
|
successfulMessages | mapping(bytes32 => bool) | 203 | 0 | 32
| contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
|
msgNonce | uint240 | 203 | 0 | 3
0 | contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
|
xDomainMsgSender | address | 204 | 0 | 2
0 | contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
|
otherMessenger | address | 204 | 0 | 2
0 | contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
|
msgNonce | uint240 | 205 | 0 | 3
0 | contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
|
receivedMessages | mapping(bytes32 => bool) | 205 | 0 | 32
| contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
|
otherMessenger | address | 206 | 0 | 20
| contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
| blockedSystemAddresses | mapping(address => bool) | 206 | 0 | 32 | contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
| receivedMessages | mapping(bytes32 => bool) | 207 | 0 | 32 | contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
|------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------|
| blockedSystemAddresses | mapping(address => bool) | 208 | 0 | 32 | contracts/L2/L2CrossDomainMessenger.sol:L2CrossDomainMessenger |
+------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------+
+------------------------+--------------------------+------+--------+-------+----------------------------------------------------------------+
=======================
=======================
➡ L2StandardBridge
➡ L2StandardBridge
=======================
=======================
+----------
-----
+-------------------------------------------------+------+--------+-------+----------------------------------------------------+
+----------+-------------------------------------------------+------+--------+-------+----------------------------------------------------+
| Name | Type | Slot | Offset | Bytes | Contract |
| Name | Type | Slot | Offset | Bytes | Contract |
+==============================================================================================================================================+
+=========================================================================================================================================+
| _initialized | uint8 | 0 | 0 | 1 | contracts/L2/L2StandardBridge.sol:L2StandardBridge |
| spacer0 | uint256 | 0 | 0 | 32 | contracts/L2/L2StandardBridge.sol:L2StandardBridge |
|---------------+-------------------------------------------------+------+--------+-------+----------------------------------------------------|
|----------+-------------------------------------------------+------+--------+-------+----------------------------------------------------|
| _initializing | bool | 0 | 1 | 1 | contracts/L2/L2StandardBridge.sol:L2StandardBridge |
| spacer1 | uint256 | 1 | 0 | 32 | contracts/L2/L2StandardBridge.sol:L2StandardBridge |
|---------------+-------------------------------------------------+------+--------+-------+----------------------------------------------------|
|----------+-------------------------------------------------+------+--------+-------+----------------------------------------------------|
| messenger | contract CrossDomainMessenger | 0 | 2 | 20 | contracts/L2/L2StandardBridge.sol:L2StandardBridge |
|---------------+-------------------------------------------------+------+--------+-------+----------------------------------------------------|
| otherBridge | contract StandardBridge | 1 | 0 | 20 | contracts/L2/L2StandardBridge.sol:L2StandardBridge |
|---------------+-------------------------------------------------+------+--------+-------+----------------------------------------------------|
| deposits | mapping(address => mapping(address => uint256)) | 2 | 0 | 32 | contracts/L2/L2StandardBridge.sol:L2StandardBridge |
| deposits | mapping(address => mapping(address => uint256)) | 2 | 0 | 32 | contracts/L2/L2StandardBridge.sol:L2StandardBridge |
+----------
-----
+-------------------------------------------------+------+--------+-------+----------------------------------------------------+
+----------+-------------------------------------------------+------+--------+-------+----------------------------------------------------+
=======================
=======================
➡ L2ToL1MessagePasser
➡ L2ToL1MessagePasser
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
