Merge pull request #3508 from ethereum-optimism/develop

ci: trigger releases

.changeset/chatty-gorillas-search.md

+---
+'@eth-optimism/contracts-bedrock': patch
+---
+
+Uses assert rather than a require statements to check for conditions we believe are unreachable.This is more semantically explicit, and should enable us to more effectively use some advanced analysis methods in our testing.

.changeset/chatty-radios-fry.md

+---
+'@eth-optimism/integration-tests': patch
+'@eth-optimism/actor-tests': patch
+'@eth-optimism/common-ts': patch
+'@eth-optimism/contracts': patch
+'@eth-optimism/contracts-bedrock': patch
+'@eth-optimism/contracts-governance': patch
+'@eth-optimism/contracts-periphery': patch
+'@eth-optimism/core-utils': patch
+'@eth-optimism/data-transport-layer': patch
+'@eth-optimism/drippie-mon': patch
+'@eth-optimism/fault-detector': patch
+'@eth-optimism/hardhat-deploy-config': patch
+'@eth-optimism/integration-tests-bedrock': patch
+'@eth-optimism/message-relayer': patch
+'@eth-optimism/replica-healthcheck': patch
+'@eth-optimism/sdk': patch
+---
+
+Bump ethers to 5.7.0 globally

.changeset/chilled-bananas-count.md

+---
+'@eth-optimism/contracts-periphery': patch
+---
+
+Drippie Spearbit audit fix for issues #32 and #33, clarify behavior of executable function

.changeset/clean-eels-pretend.md

+---
+'@eth-optimism/contracts-periphery': patch
+'@eth-optimism/drippie-mon': patch
+---
+
+Drippie Spearbit audit fix for issue #25, reorder DripStatus enum for clarity

.changeset/curvy-islands-hammer.md

+---
+'@eth-optimism/contracts-bedrock': patch
+---
+
+Fixed a backwards compatibility issue in which incorrect events were emitted during a failed deposit finalization on the L2 bridge.

.changeset/cyan-grapes-fry.md

+---
+'@eth-optimism/contracts-periphery': patch
+---
+
+Drippie Spearbit audit fix for issue #44, document drip count and increment before external calls

.changeset/dull-lies-melt.md

+---
+'@eth-optimism/fault-detector': patch
+---
+
+Adds a fault status API to the Fault Detector.

.changeset/famous-pans-battle.md

+---
+'@eth-optimism/ci-builder': patch
+---
+
+Download and verify codecov uploader binary in the ci-builder image

.changeset/fifty-rivers-hunt.md

+---
+'@eth-optimism/contracts-bedrock': patch
+---
+
+Makes spacers private and updates names to reflect slot, offset, and length.

.changeset/friendly-beds-tell.md

+---
+'@eth-optimism/contracts-periphery': patch
+---
+
+Drippie Spearbit audit fix for issue 24, use call over transfer for withdrawETH

.changeset/gold-dots-provide.md

+---
+'@eth-optimism/contracts-periphery': patch
+---
+
+Drippie Spearbit audit fix for issue 22, remove unnecessary gas parameter

.changeset/gold-singers-thank.md

+---
+'@eth-optimism/message-relayer': patch
+---
+
+Small patch release meant to test a fix for a bug in our canary release process for this package.

.changeset/great-cobras-watch.md

+---
+'@eth-optimism/fault-detector': patch
+---
+
+Fixes a small bug in the fault detector that would cause errors for testnets where the fault proof window is extremely short.

.changeset/green-pumas-pretend.md

+---
+'@eth-optimism/contracts-bedrock': patch
+---
+
+Makes finalizeWithdrawalTransaction not payable because it doesn't need to be and it was causing confusion throughout the codebase.

.changeset/itchy-years-tease.md

+---
+'@eth-optimism/contracts-bedrock': patch
+---
+
+Make the use of storage gaps consistent across contracts

.changeset/khaki-walls-worry.md

+---
+'@eth-optimism/contracts-periphery': patch
+---
+
+Drippie Spearbit audit fix for issue #34, missing natspec

.changeset/nasty-games-jog.md

+---
+'@eth-optimism/contracts-periphery': patch
+---
+
+Drippie Spearbit audit fix for issue #28, document dripcheck behavior in drip function

.changeset/new-suns-relax.md

+---
+'@eth-optimism/contracts-bedrock': patch
+---
+
+Fix to Ensure the Oracle's owner and proposer accounts are unique

.changeset/ninety-seals-breathe.md

+---
+'@eth-optimism/contracts-bedrock': patch
+'@eth-optimism/core-utils': patch
+'@eth-optimism/integration-tests-bedrock': patch
+'@eth-optimism/sdk': patch
+---
+
+Fix outdated references to 'withdrawal contract'

.changeset/olive-lizards-drive.md

+---
+'@eth-optimism/proxyd': patch
+---
+
+Add logging for origin and remote IP'

.changeset/poor-ducks-itch.md

+---
+'@eth-optimism/contracts-periphery': patch
+---
+
+Drippie Spearbit audit fix #42, remove unnecessary SLOADs in the status function

.changeset/poor-years-smell.md

+---
+'@eth-optimism/contracts-periphery': patch
+---
+
+Drippie Spearbit audit fix for issue #39, update to latest version of Solidity

.changeset/quiet-olives-roll.md

+---
+'@eth-optimism/contracts-bedrock': patch
+---
+
+Use assert statements for unreachable conditions.

.changeset/selfish-timers-wave.md

+---
+'@eth-optimism/contracts-periphery': patch
+---
+
+Drippie Spearbit audit fix for issue #21, use correct version of Solmate

.changeset/sixty-eggs-appear.md

+---
+'@eth-optimism/proxyd': patch
+---
+
+Carry over custom limit message in batches

.changeset/spicy-pianos-grow.md

+---
+'@eth-optimism/common-ts': patch
+'@eth-optimism/sdk': patch
+---
+
+Add source maps

.changeset/stale-crabs-divide.md

+---
+'@eth-optimism/contracts-periphery': patch
+---
+
+Drippie Spearbit audit fix for issue #31, require explicit opt-in for reentrant drips

.changeset/ten-bikes-cover.md

+---
+'@eth-optimism/contracts-bedrock': patch
+---
+
+Simplifies the initialization function of the CrossDomainMessenger in Bedrock

.changeset/tricky-ghosts-provide.md

+---
+'@eth-optimism/contracts-periphery': patch
+---
+
+Drippie Spearbit audit fix for issue #45, calldata over memory to save gas

.changeset/weak-moose-hope.md

+---
+'@eth-optimism/data-transport-layer': patch
+---
+
+Fixes a bug that would break DTL sync when addresses are changed

.changeset/wet-humans-divide.md

+---
+'@eth-optimism/contracts-periphery': patch
+---
+
+Drippie Spearbit audit fix for issue #35, correct contract layout ordering

.changeset/witty-trains-lay.md

+---
+'@eth-optimism/contracts-bedrock': patch
+---
+
+Update comments on GovernanceToken to match Seaport style.

.circleci/config.yml

@@ -2,7 +2,6 @@ version: 2.1
 
 orbs:
   go: circleci/go@1.5.0
-
 jobs:
   yarn-monorepo:
     docker:
@@ -33,6 +32,9 @@ jobs:
       - run:
           name: Install dependencies
           command: yarn --frozen-lockfile
+      - run:
+          name: print forge version
+          command: forge --version
       - save_cache:
           key: v2-cache-yarn-install-{{ checksum "yarn.lock" }}
           paths:
@@ -57,6 +59,7 @@ jobs:
           paths:
             - "."
 
+
   docker-publish:
     environment:
       DOCKER_BUILDKIT: 1
@@ -138,9 +141,19 @@ jobs:
             yarn slither || exit 0
           working_directory: packages/contracts-bedrock
       - run:
-          name: test
-          command: yarn test
+          name: print forge version
+          command: forge --version
           working_directory: packages/contracts-bedrock
+      - run:
+          name: test and generate coverage
+          command: yarn coverage:lcov
+          environment:
+            FOUNDRY_PROFILE: ci
+          working_directory: packages/contracts-bedrock
+      - run:
+          name: upload coverage
+          command: |
+           ./codecov --verbose || exit 0
           environment:
             FOUNDRY_PROFILE: ci
       - run:
@@ -293,6 +306,10 @@ jobs:
           command: |
             gotestsum --junitfile /test-results/op-chain-ops.xml -- -coverpkg=github.com/ethereum-optimism/optimism/... -coverprofile=coverage.out -covermode=atomic ./...
           working_directory: op-chain-ops
+      - run:
+          name: Upload coverage reports to CodeCov
+          command: |
+            ./codecov --verbose || exit 0
       - store_test_results:
           path: /test-results
       - run:

.github/workflows/publish-canary.yml

@@ -200,7 +200,7 @@ jobs:
         with:
           context: .
           file: ./ops/docker/Dockerfile.packages
-          target: relayer
+          target: message-relayer
           push: true
           tags: ethereumoptimism/message-relayer:${{ needs.canary-publish.outputs.canary-docker-tag }}
 

integration-tests/package.json

@@ -33,9 +33,9 @@
     "@eth-optimism/contracts-periphery": "^0.2.3",
     "@eth-optimism/core-utils": "0.10.0",
     "@eth-optimism/sdk": "1.6.3",
-    "@ethersproject/abstract-provider": "^5.6.1",
-    "@ethersproject/providers": "^5.6.8",
-    "@ethersproject/transactions": "^5.6.2",
+    "@ethersproject/abstract-provider": "^5.7.0",
+    "@ethersproject/providers": "^5.7.0",
+    "@ethersproject/transactions": "^5.7.0",
     "@nomiclabs/hardhat-ethers": "^2.0.2",
     "@nomiclabs/hardhat-waffle": "^2.0.1",
     "@openzeppelin/contracts": "^4.4.0",
@@ -61,7 +61,7 @@
     "eslint-plugin-react": "^7.24.0",
     "eslint-plugin-unicorn": "^42.0.0",
     "ethereum-waffle": "^3.3.0",
-    "ethers": "^5.6.8",
+    "ethers": "^5.7.0",
     "hardhat": "^2.9.6",
     "hardhat-gas-reporter": "^1.0.4",
     "lint-staged": "11.0.0",

op-bindings/bindings/deployerwhitelist_more.go

@@ -9,7 +9,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-bindings/solc"
 )
 
-const DeployerWhitelistStorageLayoutJSON = "{\"storage\":[{\"astId\":2850,\"contract\":\"contracts/legacy/DeployerWhitelist.sol:DeployerWhitelist\",\"label\":\"owner\",\"offset\":0,\"slot\":\"0\",\"type\":\"t_address\"},{\"astId\":2855,\"contract\":\"contracts/legacy/DeployerWhitelist.sol:DeployerWhitelist\",\"label\":\"whitelist\",\"offset\":0,\"slot\":\"1\",\"type\":\"t_mapping(t_address,t_bool)\"}],\"types\":{\"t_address\":{\"encoding\":\"inplace\",\"label\":\"address\",\"numberOfBytes\":\"20\"},\"t_bool\":{\"encoding\":\"inplace\",\"label\":\"bool\",\"numberOfBytes\":\"1\"},\"t_mapping(t_address,t_bool)\":{\"encoding\":\"mapping\",\"label\":\"mapping(address =\u003e bool)\",\"numberOfBytes\":\"32\",\"key\":\"t_address\",\"value\":\"t_bool\"}}}"
+const DeployerWhitelistStorageLayoutJSON = "{\"storage\":[{\"astId\":2900,\"contract\":\"contracts/legacy/DeployerWhitelist.sol:DeployerWhitelist\",\"label\":\"owner\",\"offset\":0,\"slot\":\"0\",\"type\":\"t_address\"},{\"astId\":2905,\"contract\":\"contracts/legacy/DeployerWhitelist.sol:DeployerWhitelist\",\"label\":\"whitelist\",\"offset\":0,\"slot\":\"1\",\"type\":\"t_mapping(t_address,t_bool)\"}],\"types\":{\"t_address\":{\"encoding\":\"inplace\",\"label\":\"address\",\"numberOfBytes\":\"20\"},\"t_bool\":{\"encoding\":\"inplace\",\"label\":\"bool\",\"numberOfBytes\":\"1\"},\"t_mapping(t_address,t_bool)\":{\"encoding\":\"mapping\",\"label\":\"mapping(address =\u003e bool)\",\"numberOfBytes\":\"32\",\"key\":\"t_address\",\"value\":\"t_bool\"}}}"
 
 var DeployerWhitelistStorageLayout = new(solc.StorageLayout)
 

op-bindings/bindings/gaspriceoracle_more.go

@@ -9,7 +9,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-bindings/solc"
 )
 
-const GasPriceOracleStorageLayoutJSON = "{\"storage\":[{\"astId\":27557,\"contract\":\"contracts/L2/GasPriceOracle.sol:GasPriceOracle\",\"label\":\"_owner\",\"offset\":0,\"slot\":\"0\",\"type\":\"t_address\"},{\"astId\":1727,\"contract\":\"contracts/L2/GasPriceOracle.sol:GasPriceOracle\",\"label\":\"spacer0\",\"offset\":0,\"slot\":\"1\",\"type\":\"t_uint256\"},{\"astId\":1730,\"contract\":\"contracts/L2/GasPriceOracle.sol:GasPriceOracle\",\"label\":\"spacer1\",\"offset\":0,\"slot\":\"2\",\"type\":\"t_uint256\"},{\"astId\":1733,\"contract\":\"contracts/L2/GasPriceOracle.sol:GasPriceOracle\",\"label\":\"overhead\",\"offset\":0,\"slot\":\"3\",\"type\":\"t_uint256\"},{\"astId\":1736,\"contract\":\"contracts/L2/GasPriceOracle.sol:GasPriceOracle\",\"label\":\"scalar\",\"offset\":0,\"slot\":\"4\",\"type\":\"t_uint256\"},{\"astId\":1739,\"contract\":\"contracts/L2/GasPriceOracle.sol:GasPriceOracle\",\"label\":\"decimals\",\"offset\":0,\"slot\":\"5\",\"type\":\"t_uint256\"}],\"types\":{\"t_address\":{\"encoding\":\"inplace\",\"label\":\"address\",\"numberOfBytes\":\"20\"},\"t_uint256\":{\"encoding\":\"inplace\",\"label\":\"uint256\",\"numberOfBytes\":\"32\"}}}"
+const GasPriceOracleStorageLayoutJSON = "{\"storage\":[{\"astId\":27778,\"contract\":\"contracts/L2/GasPriceOracle.sol:GasPriceOracle\",\"label\":\"_owner\",\"offset\":0,\"slot\":\"0\",\"type\":\"t_address\"},{\"astId\":1754,\"contract\":\"contracts/L2/GasPriceOracle.sol:GasPriceOracle\",\"label\":\"spacer0\",\"offset\":0,\"slot\":\"1\",\"type\":\"t_uint256\"},{\"astId\":1757,\"contract\":\"contracts/L2/GasPriceOracle.sol:GasPriceOracle\",\"label\":\"spacer1\",\"offset\":0,\"slot\":\"2\",\"type\":\"t_uint256\"},{\"astId\":1760,\"contract\":\"contracts/L2/GasPriceOracle.sol:GasPriceOracle\",\"label\":\"overhead\",\"offset\":0,\"slot\":\"3\",\"type\":\"t_uint256\"},{\"astId\":1763,\"contract\":\"contracts/L2/GasPriceOracle.sol:GasPriceOracle\",\"label\":\"scalar\",\"offset\":0,\"slot\":\"4\",\"type\":\"t_uint256\"},{\"astId\":1766,\"contract\":\"contracts/L2/GasPriceOracle.sol:GasPriceOracle\",\"label\":\"decimals\",\"offset\":0,\"slot\":\"5\",\"type\":\"t_uint256\"}],\"types\":{\"t_address\":{\"encoding\":\"inplace\",\"label\":\"address\",\"numberOfBytes\":\"20\"},\"t_uint256\":{\"encoding\":\"inplace\",\"label\":\"uint256\",\"numberOfBytes\":\"32\"}}}"
 
 var GasPriceOracleStorageLayout = new(solc.StorageLayout)
 

op-bindings/bindings/governancetoken_more.go

@@ -9,7 +9,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-bindings/solc"
 )
 
-const GovernanceTokenStorageLayoutJSON = "{\"storage\":[{\"astId\":27756,\"contract\":\"contracts/L2/GovernanceToken.sol:GovernanceToken\",\"label\":\"_balances\",\"offset\":0,\"slot\":\"0\",\"type\":\"t_mapping(t_address,t_uint256)\"},{\"astId\":27762,\"contract\":\"contracts/L2/GovernanceToken.sol:GovernanceToken\",\"label\":\"_allowances\",\"offset\":0,\"slot\":\"1\",\"type\":\"t_mapping(t_address,t_mapping(t_address,t_uint256))\"},{\"astId\":27764,\"contract\":\"contracts/L2/GovernanceToken.sol:GovernanceToken\",\"label\":\"_totalSupply\",\"offset\":0,\"slot\":\"2\",\"type\":\"t_uint256\"},{\"astId\":27766,\"contract\":\"contracts/L2/GovernanceToken.sol:GovernanceToken\",\"label\":\"_name\",\"offset\":0,\"slot\":\"3\",\"type\":\"t_string_storage\"},{\"astId\":27768,\"contract\":\"contracts/L2/GovernanceToken.sol:GovernanceToken\",\"label\":\"_symbol\",\"offset\":0,\"slot\":\"4\",\"type\":\"t_string_storage\"},{\"astId\":29133,\"contract\":\"contracts/L2/GovernanceToken.sol:GovernanceToken\",\"label\":\"_nonces\",\"offset\":0,\"slot\":\"5\",\"type\":\"t_mapping(t_address,t_struct(Counter)29922_storage)\"},{\"astId\":29141,\"contract\":\"contracts/L2/GovernanceToken.sol:GovernanceToken\",\"label\":\"_PERMIT_TYPEHASH_DEPRECATED_SLOT\",\"offset\":0,\"slot\":\"6\",\"type\":\"t_bytes32\"},{\"astId\":28474,\"contract\":\"contracts/L2/GovernanceToken.sol:GovernanceToken\",\"label\":\"_delegates\",\"offset\":0,\"slot\":\"7\",\"type\":\"t_mapping(t_address,t_address)\"},{\"astId\":28480,\"contract\":\"contracts/L2/GovernanceToken.sol:GovernanceToken\",\"label\":\"_checkpoints\",\"offset\":0,\"slot\":\"8\",\"type\":\"t_mapping(t_address,t_array(t_struct(Checkpoint)28465_storage)dyn_storage)\"},{\"astId\":28484,\"contract\":\"contracts/L2/GovernanceToken.sol:GovernanceToken\",\"label\":\"_totalSupplyCheckpoints\",\"offset\":0,\"slot\":\"9\",\"type\":\"t_array(t_struct(Checkpoint)28465_storage)dyn_storage\"},{\"astId\":27557,\"contract\":\"contracts/L2/GovernanceToken.sol:GovernanceToken\",\"label\":\"_owner\",\"offset\":0,\"slot\":\"10\",\"type\":\"t_address\"}],\"types\":{\"t_address\":{\"encoding\":\"inplace\",\"label\":\"address\",\"numberOfBytes\":\"20\"},\"t_array(t_struct(Checkpoint)28465_storage)dyn_storage\":{\"encoding\":\"dynamic_array\",\"label\":\"struct ERC20Votes.Checkpoint[]\",\"numberOfBytes\":\"32\"},\"t_bytes32\":{\"encoding\":\"inplace\",\"label\":\"bytes32\",\"numberOfBytes\":\"32\"},\"t_mapping(t_address,t_address)\":{\"encoding\":\"mapping\",\"label\":\"mapping(address =\u003e address)\",\"numberOfBytes\":\"32\",\"key\":\"t_address\",\"value\":\"t_address\"},\"t_mapping(t_address,t_array(t_struct(Checkpoint)28465_storage)dyn_storage)\":{\"encoding\":\"mapping\",\"label\":\"mapping(address =\u003e struct ERC20Votes.Checkpoint[])\",\"numberOfBytes\":\"32\",\"key\":\"t_address\",\"value\":\"t_array(t_struct(Checkpoint)28465_storage)dyn_storage\"},\"t_mapping(t_address,t_mapping(t_address,t_uint256))\":{\"encoding\":\"mapping\",\"label\":\"mapping(address =\u003e mapping(address =\u003e uint256))\",\"numberOfBytes\":\"32\",\"key\":\"t_address\",\"value\":\"t_mapping(t_address,t_uint256)\"},\"t_mapping(t_address,t_struct(Counter)29922_storage)\":{\"encoding\":\"mapping\",\"label\":\"mapping(address =\u003e struct Counters.Counter)\",\"numberOfBytes\":\"32\",\"key\":\"t_address\",\"value\":\"t_struct(Counter)29922_storage\"},\"t_mapping(t_address,t_uint256)\":{\"encoding\":\"mapping\",\"label\":\"mapping(address =\u003e uint256)\",\"numberOfBytes\":\"32\",\"key\":\"t_address\",\"value\":\"t_uint256\"},\"t_string_storage\":{\"encoding\":\"bytes\",\"label\":\"string\",\"numberOfBytes\":\"32\"},\"t_struct(Checkpoint)28465_storage\":{\"encoding\":\"inplace\",\"label\":\"struct ERC20Votes.Checkpoint\",\"numberOfBytes\":\"32\"},\"t_struct(Counter)29922_storage\":{\"encoding\":\"inplace\",\"label\":\"struct Counters.Counter\",\"numberOfBytes\":\"32\"},\"t_uint224\":{\"encoding\":\"inplace\",\"label\":\"uint224\",\"numberOfBytes\":\"28\"},\"t_uint256\":{\"encoding\":\"inplace\",\"label\":\"uint256\",\"numberOfBytes\":\"32\"},\"t_uint32\":{\"encoding\":\"inplace\",\"label\":\"uint32\",\"numberOfBytes\":\"4\"}}}"
+const GovernanceTokenStorageLayoutJSON = "{\"storage\":[{\"astId\":27977,\"contract\":\"contracts/L2/GovernanceToken.sol:GovernanceToken\",\"label\":\"_balances\",\"offset\":0,\"slot\":\"0\",\"type\":\"t_mapping(t_address,t_uint256)\"},{\"astId\":27983,\"contract\":\"contracts/L2/GovernanceToken.sol:GovernanceToken\",\"label\":\"_allowances\",\"offset\":0,\"slot\":\"1\",\"type\":\"t_mapping(t_address,t_mapping(t_address,t_uint256))\"},{\"astId\":27985,\"contract\":\"contracts/L2/GovernanceToken.sol:GovernanceToken\",\"label\":\"_totalSupply\",\"offset\":0,\"slot\":\"2\",\"type\":\"t_uint256\"},{\"astId\":27987,\"contract\":\"contracts/L2/GovernanceToken.sol:GovernanceToken\",\"label\":\"_name\",\"offset\":0,\"slot\":\"3\",\"type\":\"t_string_storage\"},{\"astId\":27989,\"contract\":\"contracts/L2/GovernanceToken.sol:GovernanceToken\",\"label\":\"_symbol\",\"offset\":0,\"slot\":\"4\",\"type\":\"t_string_storage\"},{\"astId\":29354,\"contract\":\"contracts/L2/GovernanceToken.sol:GovernanceToken\",\"label\":\"_nonces\",\"offset\":0,\"slot\":\"5\",\"type\":\"t_mapping(t_address,t_struct(Counter)30143_storage)\"},{\"astId\":29362,\"contract\":\"contracts/L2/GovernanceToken.sol:GovernanceToken\",\"label\":\"_PERMIT_TYPEHASH_DEPRECATED_SLOT\",\"offset\":0,\"slot\":\"6\",\"type\":\"t_bytes32\"},{\"astId\":28695,\"contract\":\"contracts/L2/GovernanceToken.sol:GovernanceToken\",\"label\":\"_delegates\",\"offset\":0,\"slot\":\"7\",\"type\":\"t_mapping(t_address,t_address)\"},{\"astId\":28701,\"contract\":\"contracts/L2/GovernanceToken.sol:GovernanceToken\",\"label\":\"_checkpoints\",\"offset\":0,\"slot\":\"8\",\"type\":\"t_mapping(t_address,t_array(t_struct(Checkpoint)28686_storage)dyn_storage)\"},{\"astId\":28705,\"contract\":\"contracts/L2/GovernanceToken.sol:GovernanceToken\",\"label\":\"_totalSupplyCheckpoints\",\"offset\":0,\"slot\":\"9\",\"type\":\"t_array(t_struct(Checkpoint)28686_storage)dyn_storage\"},{\"astId\":27778,\"contract\":\"contracts/L2/GovernanceToken.sol:GovernanceToken\",\"label\":\"_owner\",\"offset\":0,\"slot\":\"10\",\"type\":\"t_address\"}],\"types\":{\"t_address\":{\"encoding\":\"inplace\",\"label\":\"address\",\"numberOfBytes\":\"20\"},\"t_array(t_struct(Checkpoint)28686_storage)dyn_storage\":{\"encoding\":\"dynamic_array\",\"label\":\"struct ERC20Votes.Checkpoint[]\",\"numberOfBytes\":\"32\"},\"t_bytes32\":{\"encoding\":\"inplace\",\"label\":\"bytes32\",\"numberOfBytes\":\"32\"},\"t_mapping(t_address,t_address)\":{\"encoding\":\"mapping\",\"label\":\"mapping(address =\u003e address)\",\"numberOfBytes\":\"32\",\"key\":\"t_address\",\"value\":\"t_address\"},\"t_mapping(t_address,t_array(t_struct(Checkpoint)28686_storage)dyn_storage)\":{\"encoding\":\"mapping\",\"label\":\"mapping(address =\u003e struct ERC20Votes.Checkpoint[])\",\"numberOfBytes\":\"32\",\"key\":\"t_address\",\"value\":\"t_array(t_struct(Checkpoint)28686_storage)dyn_storage\"},\"t_mapping(t_address,t_mapping(t_address,t_uint256))\":{\"encoding\":\"mapping\",\"label\":\"mapping(address =\u003e mapping(address =\u003e uint256))\",\"numberOfBytes\":\"32\",\"key\":\"t_address\",\"value\":\"t_mapping(t_address,t_uint256)\"},\"t_mapping(t_address,t_struct(Counter)30143_storage)\":{\"encoding\":\"mapping\",\"label\":\"mapping(address =\u003e struct Counters.Counter)\",\"numberOfBytes\":\"32\",\"key\":\"t_address\",\"value\":\"t_struct(Counter)30143_storage\"},\"t_mapping(t_address,t_uint256)\":{\"encoding\":\"mapping\",\"label\":\"mapping(address =\u003e uint256)\",\"numberOfBytes\":\"32\",\"key\":\"t_address\",\"value\":\"t_uint256\"},\"t_string_storage\":{\"encoding\":\"bytes\",\"label\":\"string\",\"numberOfBytes\":\"32\"},\"t_struct(Checkpoint)28686_storage\":{\"encoding\":\"inplace\",\"label\":\"struct ERC20Votes.Checkpoint\",\"numberOfBytes\":\"32\"},\"t_struct(Counter)30143_storage\":{\"encoding\":\"inplace\",\"label\":\"struct Counters.Counter\",\"numberOfBytes\":\"32\"},\"t_uint224\":{\"encoding\":\"inplace\",\"label\":\"uint224\",\"numberOfBytes\":\"28\"},\"t_uint256\":{\"encoding\":\"inplace\",\"label\":\"uint256\",\"numberOfBytes\":\"32\"},\"t_uint32\":{\"encoding\":\"inplace\",\"label\":\"uint32\",\"numberOfBytes\":\"4\"}}}"
 
 var GovernanceTokenStorageLayout = new(solc.StorageLayout)
 

op-bindings/bindings/l1block_more.go

@@ -9,7 +9,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-bindings/solc"
 )
 
-const L1BlockStorageLayoutJSON = "{\"storage\":[{\"astId\":2074,\"contract\":\"contracts/L2/L1Block.sol:L1Block\",\"label\":\"number\",\"offset\":0,\"slot\":\"0\",\"type\":\"t_uint64\"},{\"astId\":2077,\"contract\":\"contracts/L2/L1Block.sol:L1Block\",\"label\":\"timestamp\",\"offset\":8,\"slot\":\"0\",\"type\":\"t_uint64\"},{\"astId\":2080,\"contract\":\"contracts/L2/L1Block.sol:L1Block\",\"label\":\"basefee\",\"offset\":0,\"slot\":\"1\",\"type\":\"t_uint256\"},{\"astId\":2083,\"contract\":\"contracts/L2/L1Block.sol:L1Block\",\"label\":\"hash\",\"offset\":0,\"slot\":\"2\",\"type\":\"t_bytes32\"},{\"astId\":2086,\"contract\":\"contracts/L2/L1Block.sol:L1Block\",\"label\":\"sequenceNumber\",\"offset\":0,\"slot\":\"3\",\"type\":\"t_uint64\"}],\"types\":{\"t_bytes32\":{\"encoding\":\"inplace\",\"label\":\"bytes32\",\"numberOfBytes\":\"32\"},\"t_uint256\":{\"encoding\":\"inplace\",\"label\":\"uint256\",\"numberOfBytes\":\"32\"},\"t_uint64\":{\"encoding\":\"inplace\",\"label\":\"uint64\",\"numberOfBytes\":\"8\"}}}"
+const L1BlockStorageLayoutJSON = "{\"storage\":[{\"astId\":2101,\"contract\":\"contracts/L2/L1Block.sol:L1Block\",\"label\":\"number\",\"offset\":0,\"slot\":\"0\",\"type\":\"t_uint64\"},{\"astId\":2104,\"contract\":\"contracts/L2/L1Block.sol:L1Block\",\"label\":\"timestamp\",\"offset\":8,\"slot\":\"0\",\"type\":\"t_uint64\"},{\"astId\":2107,\"contract\":\"contracts/L2/L1Block.sol:L1Block\",\"label\":\"basefee\",\"offset\":0,\"slot\":\"1\",\"type\":\"t_uint256\"},{\"astId\":2110,\"contract\":\"contracts/L2/L1Block.sol:L1Block\",\"label\":\"hash\",\"offset\":0,\"slot\":\"2\",\"type\":\"t_bytes32\"},{\"astId\":2113,\"contract\":\"contracts/L2/L1Block.sol:L1Block\",\"label\":\"sequenceNumber\",\"offset\":0,\"slot\":\"3\",\"type\":\"t_uint64\"}],\"types\":{\"t_bytes32\":{\"encoding\":\"inplace\",\"label\":\"bytes32\",\"numberOfBytes\":\"32\"},\"t_uint256\":{\"encoding\":\"inplace\",\"label\":\"uint256\",\"numberOfBytes\":\"32\"},\"t_uint64\":{\"encoding\":\"inplace\",\"label\":\"uint64\",\"numberOfBytes\":\"8\"}}}"
 
 var L1BlockStorageLayout = new(solc.StorageLayout)
 

op-bindings/bindings/l2tol1messagepasser_more.go

@@ -9,7 +9,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-bindings/solc"
 )
 
-const L2ToL1MessagePasserStorageLayoutJSON = "{\"storage\":[{\"astId\":2543,\"contract\":\"contracts/L2/L2ToL1MessagePasser.sol:L2ToL1MessagePasser\",\"label\":\"sentMessages\",\"offset\":0,\"slot\":\"0\",\"type\":\"t_mapping(t_bytes32,t_bool)\"},{\"astId\":2546,\"contract\":\"contracts/L2/L2ToL1MessagePasser.sol:L2ToL1MessagePasser\",\"label\":\"nonce\",\"offset\":0,\"slot\":\"1\",\"type\":\"t_uint256\"}],\"types\":{\"t_bool\":{\"encoding\":\"inplace\",\"label\":\"bool\",\"numberOfBytes\":\"1\"},\"t_bytes32\":{\"encoding\":\"inplace\",\"label\":\"bytes32\",\"numberOfBytes\":\"32\"},\"t_mapping(t_bytes32,t_bool)\":{\"encoding\":\"mapping\",\"label\":\"mapping(bytes32 =\u003e bool)\",\"numberOfBytes\":\"32\",\"key\":\"t_bytes32\",\"value\":\"t_bool\"},\"t_uint256\":{\"encoding\":\"inplace\",\"label\":\"uint256\",\"numberOfBytes\":\"32\"}}}"
+const L2ToL1MessagePasserStorageLayoutJSON = "{\"storage\":[{\"astId\":2593,\"contract\":\"contracts/L2/L2ToL1MessagePasser.sol:L2ToL1MessagePasser\",\"label\":\"sentMessages\",\"offset\":0,\"slot\":\"0\",\"type\":\"t_mapping(t_bytes32,t_bool)\"},{\"astId\":2596,\"contract\":\"contracts/L2/L2ToL1MessagePasser.sol:L2ToL1MessagePasser\",\"label\":\"nonce\",\"offset\":0,\"slot\":\"1\",\"type\":\"t_uint256\"}],\"types\":{\"t_bool\":{\"encoding\":\"inplace\",\"label\":\"bool\",\"numberOfBytes\":\"1\"},\"t_bytes32\":{\"encoding\":\"inplace\",\"label\":\"bytes32\",\"numberOfBytes\":\"32\"},\"t_mapping(t_bytes32,t_bool)\":{\"encoding\":\"mapping\",\"label\":\"mapping(bytes32 =\u003e bool)\",\"numberOfBytes\":\"32\",\"key\":\"t_bytes32\",\"value\":\"t_bool\"},\"t_uint256\":{\"encoding\":\"inplace\",\"label\":\"uint256\",\"numberOfBytes\":\"32\"}}}"
 
 var L2ToL1MessagePasserStorageLayout = new(solc.StorageLayout)
 

op-bindings/bindings/legacyerc20eth_more.go

@@ -9,7 +9,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-bindings/solc"
 )
 
-const LegacyERC20ETHStorageLayoutJSON = "{\"storage\":[{\"astId\":27756,\"contract\":\"contracts/legacy/LegacyERC20ETH.sol:LegacyERC20ETH\",\"label\":\"_balances\",\"offset\":0,\"slot\":\"0\",\"type\":\"t_mapping(t_address,t_uint256)\"},{\"astId\":27762,\"contract\":\"contracts/legacy/LegacyERC20ETH.sol:LegacyERC20ETH\",\"label\":\"_allowances\",\"offset\":0,\"slot\":\"1\",\"type\":\"t_mapping(t_address,t_mapping(t_address,t_uint256))\"},{\"astId\":27764,\"contract\":\"contracts/legacy/LegacyERC20ETH.sol:LegacyERC20ETH\",\"label\":\"_totalSupply\",\"offset\":0,\"slot\":\"2\",\"type\":\"t_uint256\"},{\"astId\":27766,\"contract\":\"contracts/legacy/LegacyERC20ETH.sol:LegacyERC20ETH\",\"label\":\"_name\",\"offset\":0,\"slot\":\"3\",\"type\":\"t_string_storage\"},{\"astId\":27768,\"contract\":\"contracts/legacy/LegacyERC20ETH.sol:LegacyERC20ETH\",\"label\":\"_symbol\",\"offset\":0,\"slot\":\"4\",\"type\":\"t_string_storage\"},{\"astId\":24945,\"contract\":\"contracts/legacy/LegacyERC20ETH.sol:LegacyERC20ETH\",\"label\":\"remoteToken\",\"offset\":0,\"slot\":\"5\",\"type\":\"t_address\"},{\"astId\":24948,\"contract\":\"contracts/legacy/LegacyERC20ETH.sol:LegacyERC20ETH\",\"label\":\"bridge\",\"offset\":0,\"slot\":\"6\",\"type\":\"t_address\"}],\"types\":{\"t_address\":{\"encoding\":\"inplace\",\"label\":\"address\",\"numberOfBytes\":\"20\"},\"t_mapping(t_address,t_mapping(t_address,t_uint256))\":{\"encoding\":\"mapping\",\"label\":\"mapping(address =\u003e mapping(address =\u003e uint256))\",\"numberOfBytes\":\"32\",\"key\":\"t_address\",\"value\":\"t_mapping(t_address,t_uint256)\"},\"t_mapping(t_address,t_uint256)\":{\"encoding\":\"mapping\",\"label\":\"mapping(address =\u003e uint256)\",\"numberOfBytes\":\"32\",\"key\":\"t_address\",\"value\":\"t_uint256\"},\"t_string_storage\":{\"encoding\":\"bytes\",\"label\":\"string\",\"numberOfBytes\":\"32\"},\"t_uint256\":{\"encoding\":\"inplace\",\"label\":\"uint256\",\"numberOfBytes\":\"32\"}}}"
+const LegacyERC20ETHStorageLayoutJSON = "{\"storage\":[{\"astId\":27977,\"contract\":\"contracts/legacy/LegacyERC20ETH.sol:LegacyERC20ETH\",\"label\":\"_balances\",\"offset\":0,\"slot\":\"0\",\"type\":\"t_mapping(t_address,t_uint256)\"},{\"astId\":27983,\"contract\":\"contracts/legacy/LegacyERC20ETH.sol:LegacyERC20ETH\",\"label\":\"_allowances\",\"offset\":0,\"slot\":\"1\",\"type\":\"t_mapping(t_address,t_mapping(t_address,t_uint256))\"},{\"astId\":27985,\"contract\":\"contracts/legacy/LegacyERC20ETH.sol:LegacyERC20ETH\",\"label\":\"_totalSupply\",\"offset\":0,\"slot\":\"2\",\"type\":\"t_uint256\"},{\"astId\":27987,\"contract\":\"contracts/legacy/LegacyERC20ETH.sol:LegacyERC20ETH\",\"label\":\"_name\",\"offset\":0,\"slot\":\"3\",\"type\":\"t_string_storage\"},{\"astId\":27989,\"contract\":\"contracts/legacy/LegacyERC20ETH.sol:LegacyERC20ETH\",\"label\":\"_symbol\",\"offset\":0,\"slot\":\"4\",\"type\":\"t_string_storage\"},{\"astId\":25155,\"contract\":\"contracts/legacy/LegacyERC20ETH.sol:LegacyERC20ETH\",\"label\":\"remoteToken\",\"offset\":0,\"slot\":\"5\",\"type\":\"t_address\"},{\"astId\":25158,\"contract\":\"contracts/legacy/LegacyERC20ETH.sol:LegacyERC20ETH\",\"label\":\"bridge\",\"offset\":0,\"slot\":\"6\",\"type\":\"t_address\"}],\"types\":{\"t_address\":{\"encoding\":\"inplace\",\"label\":\"address\",\"numberOfBytes\":\"20\"},\"t_mapping(t_address,t_mapping(t_address,t_uint256))\":{\"encoding\":\"mapping\",\"label\":\"mapping(address =\u003e mapping(address =\u003e uint256))\",\"numberOfBytes\":\"32\",\"key\":\"t_address\",\"value\":\"t_mapping(t_address,t_uint256)\"},\"t_mapping(t_address,t_uint256)\":{\"encoding\":\"mapping\",\"label\":\"mapping(address =\u003e uint256)\",\"numberOfBytes\":\"32\",\"key\":\"t_address\",\"value\":\"t_uint256\"},\"t_string_storage\":{\"encoding\":\"bytes\",\"label\":\"string\",\"numberOfBytes\":\"32\"},\"t_uint256\":{\"encoding\":\"inplace\",\"label\":\"uint256\",\"numberOfBytes\":\"32\"}}}"
 
 var LegacyERC20ETHStorageLayout = new(solc.StorageLayout)
 

op-bindings/bindings/sequencerfeevault_more.go

@@ -9,7 +9,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-bindings/solc"
 )
 
-const SequencerFeeVaultStorageLayoutJSON = "{\"storage\":[{\"astId\":2691,\"contract\":\"contracts/L2/SequencerFeeVault.sol:SequencerFeeVault\",\"label\":\"l1FeeWallet\",\"offset\":0,\"slot\":\"0\",\"type\":\"t_address\"}],\"types\":{\"t_address\":{\"encoding\":\"inplace\",\"label\":\"address\",\"numberOfBytes\":\"20\"}}}"
+const SequencerFeeVaultStorageLayoutJSON = "{\"storage\":[{\"astId\":2741,\"contract\":\"contracts/L2/SequencerFeeVault.sol:SequencerFeeVault\",\"label\":\"l1FeeWallet\",\"offset\":0,\"slot\":\"0\",\"type\":\"t_address\"}],\"types\":{\"t_address\":{\"encoding\":\"inplace\",\"label\":\"address\",\"numberOfBytes\":\"20\"}}}"
 
 var SequencerFeeVaultStorageLayout = new(solc.StorageLayout)
 

op-chain-ops/genesis/config.go

@@ -108,6 +108,9 @@ func NewL2ImmutableConfig(config *DeployConfig, block *types.Block, proxyL1Stand
 	immutable["L2StandardBridge"] = immutables.ImmutableValues{
 		"otherBridge": proxyL1StandardBridge,
 	}
+	immutable["L2CrossDomainMessenger"] = immutables.ImmutableValues{
+		"otherMessenger": proxyL1CrossDomainMessenger,
+	}
 
 	return immutable, nil
 }
@@ -129,7 +132,6 @@ func NewL2StorageConfig(config *DeployConfig, block *types.Block, proxyL1Standar
 		"_paused":          false,
 		"xDomainMsgSender": "0x000000000000000000000000000000000000dEaD",
 		"msgNonce":         0,
-		"otherMessenger":   proxyL1CrossDomainMessenger,
 	}
 	storage["GasPriceOracle"] = state.StorageValues{
 		"_owner":   config.GasPriceOracleOwner,

op-chain-ops/immutables/immutables.go

@@ -37,6 +37,9 @@ func BuildOptimism(immutable ImmutableConfig) (DeploymentResults, error) {
 		},
 		{
 			Name: "L2CrossDomainMessenger",
+			Args: []interface{}{
+				immutable["L2CrossDomainMessenger"]["otherMessenger"],
+			},
 		},
 		{
 			Name: "L2StandardBridge",
@@ -91,10 +94,11 @@ func l2Deployer(backend *backends.SimulatedBackend, opts *bind.TransactOpts, dep
 		// No arguments required for the L1Block contract
 		addr, _, _, err = bindings.DeployL1Block(opts, backend)
 	case "L2CrossDomainMessenger":
-		// The L1CrossDomainMessenger value is not immutable, no need to set
-		// it here correctly
-		l1CrossDomainMessenger := common.Address{}
-		addr, _, _, err = bindings.DeployL2CrossDomainMessenger(opts, backend, l1CrossDomainMessenger)
+		otherMessenger, ok := deployment.Args[0].(common.Address)
+		if !ok {
+			return common.Address{}, fmt.Errorf("invalid type for otherMessenger")
+		}
+		addr, _, _, err = bindings.DeployL2CrossDomainMessenger(opts, backend, otherMessenger)
 	case "L2StandardBridge":
 		otherBridge, ok := deployment.Args[0].(common.Address)
 		if !ok {

op-chain-ops/immutables/immutables_test.go

@@ -13,6 +13,9 @@ func TestBuildOptimism(t *testing.T) {
 		"L2StandardBridge": {
 			"otherBridge": common.HexToAddress("0x1234567890123456789012345678901234567890"),
 		},
+		"L2CrossDomainMessenger": {
+			"otherMessenger": common.HexToAddress("0x1234567890123456789012345678901234567890"),
+		},
 	})
 	require.Nil(t, err)
 	require.NotNil(t, results)

op-node/withdrawals/utils.go

@@ -219,10 +219,10 @@ func FinalizeWithdrawalParameters(ctx context.Context, l2client ProofClient, txH
 		BlockNumber: new(big.Int).Set(header.Number),
 		Data:        ev.Data,
 		OutputRootProof: bindings.TypesOutputRootProof{
-			Version:               [32]byte{}, // Empty for version 1
-			StateRoot:             header.Root,
-			WithdrawerStorageRoot: p.StorageHash,
-			LatestBlockhash:       header.Hash(),
+			Version:                  [32]byte{}, // Empty for version 1
+			StateRoot:                header.Root,
+			MessagePasserStorageRoot: p.StorageHash,
+			LatestBlockhash:          header.Hash(),
 		},
 		WithdrawalProof: withdrawalProof,
 	}, nil
@@ -235,7 +235,8 @@ var (
 	AddressType, _ = abi.NewType("address", "", nil)
 )
 
-// WithdrawalHash computes the hash of the withdrawal that was stored in the L2 withdrawal contract state.
+// WithdrawalHash computes the hash of the withdrawal that was stored in the L2toL1MessagePasser
+// contract state.
 // TODO:
 //   - I don't like having to use the ABI Generated struct
 //   - There should be a better way to run the ABI encoding

ops-bedrock/oneshot/Dockerfile.oneshot

+ARG op_node_image
+ARG op_geth_image
+
+FROM us-central1-docker.pkg.dev/bedrock-goerli-development/images/op-node:$op_node_image as op_node
+
+FROM ethereumoptimism/op-geth:$op_geth_image as op_geth
+
+FROM alpine:3.16.2
+
+ARG network_name
+ARG S6_OVERLAY_VERSION=3.1.0.1
+
+ENV JWT_SECRET=dummy
+ENV P2P_SECRET=dummy
+
+ENV OP_GETH_VERBOSITY=3 \
+	OP_GETH_HTTP_ADDR="0.0.0.0" \
+	OP_GETH_HTTP_CORSDOMAIN="*" \
+	OP_GETH_HTTP_VHOSTS="*" \
+	OP_GETH_HTTP_PORT=8545 \
+	OP_GETH_WS_ADDR="0.0.0.0" \
+	OP_GETH_WS_PORT=8546 \
+	OP_GETH_WS_ORIGINS="*" \
+	OP_GETH_MAX_PEERS=1 \
+	OP_GETH_SEQUENCER_HTTP="https://$network_name-sequencer.bedrock-goerli.optimism.io"
+
+RUN apk add --no-cache curl jq bash hexdump musl-dev linux-headers
+
+COPY --from=op_node /usr/local/bin/op-node /usr/local/bin/op-node
+COPY --from=op_geth /usr/local/bin/geth /usr/local/bin/geth
+
+ADD https://storage.googleapis.com/bedrock-goerli-regenesis-data/$network_name/rollup.json /etc/op-node/rollup.json
+ADD https://storage.googleapis.com/bedrock-goerli-regenesis-data/$network_name/genesis.json /etc/op-geth/genesis.json
+ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp
+ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz.sha256 /tmp
+ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-x86_64.tar.xz /tmp
+ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-x86_64.tar.xz.sha256 /tmp
+
+COPY ./s6-rc.d /etc/s6-overlay/s6-rc.d
+COPY ./op-init.sh /usr/local/bin/op-init.sh
+
+RUN cd /tmp && \
+	sha256sum -c *.sha256 && \
+	tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz && \
+	tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz && \
+	chmod +x /usr/local/bin/op-init.sh
+
+ENV OP_NODE_L1_ETH_RPC=dummy \
+	OP_NODE_RPC_ADDR=0.0.0.0 \
+	OP_NODE_RPC_PORT=9545 \
+	OP_NODE_P2P_DISABLE=false \
+	OP_NODE_P2P_NO_DISCOVERY=false \
+	OP_NODE_P2P_LISTEN_IP=0.0.0.0 \
+	OP_NODE_P2P_LISTEN_TCP_PORT=9003 \
+	OP_NODE_P2P_LISTEN_UDP_PORT=9003 \
+	OP_NODE_P2P_ADVERTISE_TCP=9003 \
+	OP_NODE_P2P_ADVERTISE_UDP=9003 \
+	OP_NODE_METRICS_ENABLED=true \
+	OP_NODE_METRICS_ADDR=0.0.0.0 \
+	OP_NODE_METRICS_PORT=7300 \
+	OP_NODE_SEQUENCER_L1_CONFS=4 \
+	OP_NODE_VERIFIER_L1_CONFS=4 \
+	OP_NODE_LOG_FORMAT=json \
+	OP_NODE_PPROF_ENABLED=false \
+	OP_NODE_PPROF_PORT=6666 \
+	OP_NODE_PPROF_ADDR=0.0.0.0 \
+	OP_NODE_HEARTBEAT_ENABLED=true
+
+VOLUME ["/db", "/p2p"]
+
+ENTRYPOINT ["/init"]
\ No newline at end of file

ops-bedrock/oneshot/README.md

+# Oneshot Builds
+
+This build creates a single image that runs both `op-geth` and `op-node` against a specific network. It also exposes various environment variables that are useful to configure a Bedrock replica. 
+
+## Usage
+
+The only thing you need to set to get your replica working is the `OP_NODE_L1_ETH_RPC` environment variable. Set this to an L1 RPC you control, and the container will take care of the rest. The full list of env vars you can set is below:
+
+**Opnode Configuration**
+
+Env Var|Default|Usage
+---|---|---
+`OP_NODE_L1_ETH_RPC`|dummy|RPC URL for an L1 Ethereum node.
+`OP_NODE_RPC_PORT`|9545|RPC port for the op node to listen on.
+`OP_NODE_P2P_DISABLE`|false|Whether or not P2P should be disabled.
+`OP_NODE_P2P_NO_DISCOVERY`|false|Whether or not peer discovery should be disabled.
+`OP_NODE_P2P_LISTEN_IP`|0.0.0.0|P2P listen IP.
+`OP_NODE_P2P_LISTEN_TCP_PORT`|9222|TCP port the P2P stack should listen on.
+`OP_NODE_P2P_LISTEN_UDP_PORT`|9222|UDP port the P2P stack should listen on.
+`OP_NODE_P2P_ADVERTISE_TCP`|9222|Port the P2P stack should listen on. Should usually be `OP_NODE_P2P_ADVERTISE_TCP`.
+`OP_NODE_P2P_ADVERTISE_UDP`|9222|Port the P2P stack should listen on. Should usually be `OP_NODE_P2P_ADVERTISE_UDP`.
+`OP_NODE_METRICS_ENABLED`|true|Enables Prometheus metrics.
+`OP_NODE_METRICS_ADDR`|0.0.0.0|Address the metrics server should listen on.
+`OP_NODE_METRICS_PORT`|7300|Port the metrics server should listen on.
+`OP_NODE_LOG_FORMAT`|json|Log format. Can be JSON or text.
+`OP_NODE_PPROF_ENABLED`|false|Enables `pprof` for profiling.
+`OP_NODE_PPROF_PORT`|6666|Port `pprof` should listen on.
+`OP_NODE_PPROF_ADDR`|0.0.0.0|Address `pprof` should listen on.
+`OP_NODE_HEARTBEAT_ENABLED`|true|Whether or not to enable heartbeating.
+`OP_NODE_HEARTBEAT_MONIKER`||Optional moniker to use while heartbeating.
+
+**op-geth Configuration**
+
+Env Var|Default|Usage
+---|---|---
+`OP_GETH_VERBOSITY`|3|Number 1-5 that controls how verbosely Geth should log.
+`OP_GETH_HTTP_ADDR`|0.0.0.0|Address Geth should listen on.
+`OP_GETH_HTTP_CORSDOMAIN`|*|CORS domain Geth should allow.
+`OP_GETH_HTTP_PORT`|8545|HTTP port Geth should listen on.
+`OP_GETH_WS_ADDR`|0.0.0.0|WS address Geth should listen on.
+`OP_GETH_WS_PORT`|8546|WS port Geth should listeno n.
+`OP_GETH_WS_ORIGINS`|*|WS origins Geth should allow.
+
+**Other Configuration**
+
+Additionally, the node exposes the following volumes should you wish to mount them somewhere yourself:
+
+- `/db` contains Geth's database.
+- `/p2p` contains the opnode's peer store.
+
+
+## Architecture
+
+Oneshot uses s6-overlay under the hood to supervise the processes it runs. It includes three services:
+
+1. `op-init`: A oneshot service that `op-init` and `op-node` use to initialize themselves.
+2. `op-geth`: A longrun service that manages the Geth node.
+3. `op-node`: A longrun service that manages the opnode.
\ No newline at end of file

ops-bedrock/oneshot/op-init.sh

+#!/command/with-contenv bash
+
+set -eu
+
+GETH_DATA_DIR=/db
+GETH_CHAINDATA_DIR="$GETH_DATA_DIR/geth/chaindata"
+GETH_KEYSTORE_DIR="$GETH_DATA_DIR/keystore"
+GENESIS_FILE_PATH="/etc/op-geth/genesis.json"
+
+mkdir -p /etc/secrets
+
+if [ "$OP_NODE_L1_ETH_RPC" = "dummy" ]; then
+	echo "You must specify the OP_NODE_L1_ETH_RPC environment variable."
+	exit 1	
+fi
+
+if [ "$JWT_SECRET" = "dummy" ]; then
+	echo "Regenerating JWT secret."
+	hexdump -vn32 -e'4/4 "%08X" 1 ""' /dev/urandom > /etc/secrets/jwt-secret.txt
+else
+	echo "Found JWT secret."
+fi
+
+if [ "$P2P_SECRET" = "dummy" ]; then
+	echo "Regenerating P2P private key."
+	hexdump -vn32 -e'4/4 "%08X" 1 ""' /dev/urandom > /etc/secrets/p2p-private-key.txt
+else
+	echo "Found P2P private key."
+fi
+
+if [ ! -d "$GETH_CHAINDATA_DIR" ]; then
+	echo "$GETH_CHAINDATA_DIR missing, running init"
+	echo "Initializing genesis."
+	geth --verbosity="$OP_GETH_VERBOSITY" init \
+		--datadir="$GETH_DATA_DIR" \
+		"$GENESIS_FILE_PATH"
+else
+	echo "$GETH_CHAINDATA_DIR exists."
+fi
\ No newline at end of file

ops-bedrock/oneshot/s6-rc.d/op-geth/run

+#!/command/with-contenv bash
+
+set -eu
+
+GETH_DATA_DIR=/db
+CHAIN_ID=$(cat "/etc/op-geth/genesis.json" | jq -r .config.chainId)
+
+# Warning: Archive mode is required, otherwise old trie nodes will be
+# pruned within minutes of starting the devnet.
+
+exec geth \
+	--datadir="$GETH_DATA_DIR" \
+	--verbosity="$OP_GETH_VERBOSITY" \
+	--http \
+	--http.addr="$OP_GETH_HTTP_ADDR" \
+	--http.corsdomain="$OP_GETH_HTTP_CORSDOMAIN" \
+	--http.vhosts="$OP_GETH_HTTP_VHOSTS" \
+	--http.port="$OP_GETH_HTTP_PORT" \
+	--http.api=web3,debug,eth,txpool,net,engine \
+	--ws \
+	--ws.addr="$OP_GETH_WS_ADDR" \
+	--ws.port="$OP_GETH_WS_PORT" \
+	--ws.origins="$OP_GETH_WS_ORIGINS" \
+	--ws.api=debug,eth,txpool,net,engine \
+	--syncmode=full \
+	--nodiscover \
+	--maxpeers="$OP_GETH_MAX_PEERS" \
+	--networkid=$CHAIN_ID \
+	--gcmode=archive \
+	--rollup.sequencerhttp="$OP_GETH_SEQUENCER_HTTP" \
+	--authrpc.jwtsecret=/etc/secrets/jwt-secret.txt
+	"$@"
\ No newline at end of file

ops-bedrock/oneshot/s6-rc.d/op-geth/type

+longrun
\ No newline at end of file

ops-bedrock/oneshot/s6-rc.d/op-init/type

+oneshot
\ No newline at end of file

ops-bedrock/oneshot/s6-rc.d/op-init/up

+/usr/local/bin/op-init.sh
\ No newline at end of file

ops-bedrock/oneshot/s6-rc.d/op-node/run

+#!/command/with-contenv bash
+set -eu
+
+export OP_NODE_ROLLUP_CONFIG=/etc/op-node/rollup.json
+export OP_NODE_L2_ETH_RPC=ws://0.0.0.0:$OP_GETH_WS_PORT
+export OP_NODE_L2_ENGINE_RPC=ws://0.0.0.0:$OP_GETH_WS_PORT
+export OP_NODE_L2_ENGINE_AUTH=/etc/secrets/jwt-secret.txt
+export OP_NODE_P2P_PRIV_PATH=/etc/secrets/p2p-private-key.txt
+export OP_NODE_P2P_PEERSTORE_PATH=/p2p/
+export OP_NODE_P2P_DISCOVERY_PATH=/p2p/discovery
+
+printenv
+
+exec op-node
\ No newline at end of file

ops-bedrock/oneshot/s6-rc.d/op-node/type

+longrun
\ No newline at end of file

package.json

@@ -95,8 +95,6 @@
   "dependencies": {
     "@changesets/cli": "^2.16.0",
     "@codechecks/client": "^0.1.11",
-    "@ethersproject/abstract-provider": "^5.6.1",
-    "@openzeppelin/contracts": "^4.3.2",
-    "@openzeppelin/contracts-upgradeable": "^4.3.2"
+    "@ethersproject/abstract-provider": "^5.7.0"
   }
 }

packages/actor-tests/package.json

@@ -33,7 +33,7 @@
     "eslint-plugin-jsdoc": "^35.1.2",
     "eslint-plugin-prefer-arrow": "^1.2.3",
     "eslint-plugin-prettier": "^3.4.0",
-    "ethers": "^5.6.9",
+    "ethers": "^5.7.0",
     "prom-client": "^14.0.1",
     "typescript": "^4.3.5"
   }

packages/contracts-bedrock/README.md

@@ -102,6 +102,8 @@ Some basic rules:
 We also have the following custom tags:
 
 - `@custom:proxied`: Add to a contract whenever it's meant to live behind a proxy.
+- `@custom:upgradeable`: Add to a contract whenever it's meant to be used in an upgradeable contract.
+- `@custom:semver`: Add to a constructor to indicate the version of a contract.
 - `@custom:legacy`: Add to an event or function when it only exists for legacy support.
 
 #### Errors
@@ -118,6 +120,12 @@ We also have the following custom tags:
 
 - Event parameters should NOT be prefixed with an underscore.
 
+#### Spacers
+
+We use spacer variables to account for old storage slots that are no longer being used.
+The name of a spacer variable MUST be in the format `spacer_<slot>_<offset>_<length>` where `<slot>` is the original storage slot number, `<offset>` is the original offset position within the storage slot, and `<length>` is the original size of the variable.
+Spacers MUST be `private`.
+
 ### Proxy by Default
 
 All contracts should be assumed to live behind proxies (except in certain special circumstances).

packages/contracts-bedrock/contracts/L1/ResourceMetering.sol

@@ -8,6 +8,7 @@ import { FixedPointMathLib } from "@rari-capital/solmate/src/utils/FixedPointMat
 import { Burn } from "../libraries/Burn.sol";
 
 /**
+ * @custom:upgradeable
  * @title ResourceMetering
  * @notice ResourceMetering implements an EIP-1559 style resource metering system where pricing
  *         updates automatically based on current demand.

packages/contracts-bedrock/contracts/L2/L2CrossDomainMessenger.sol

@@ -21,17 +21,18 @@ contract L2CrossDomainMessenger is CrossDomainMessenger, Semver {
      *
      * @param _l1CrossDomainMessenger Address of the L1CrossDomainMessenger contract.
      */
-    constructor(address _l1CrossDomainMessenger) Semver(0, 0, 1) {
-        initialize(_l1CrossDomainMessenger);
+    constructor(address _l1CrossDomainMessenger)
+        Semver(0, 0, 1)
+        CrossDomainMessenger(_l1CrossDomainMessenger)
+    {
+        initialize();
     }
 
     /**
      * @notice Initializer.
-     *
-     * @param _l1CrossDomainMessenger Address of the L1CrossDomainMessenger contract.
      */
-    function initialize(address _l1CrossDomainMessenger) public initializer {
-        __CrossDomainMessenger_init(_l1CrossDomainMessenger);
+    function initialize() public initializer {
+        __CrossDomainMessenger_init();
     }
 
     /**

packages/contracts-bedrock/contracts/libraries/Hashing.sol

@@ -164,7 +164,7 @@ library Hashing {
                 abi.encode(
                     _outputRootProof.version,
                     _outputRootProof.stateRoot,
-                    _outputRootProof.withdrawerStorageRoot,
+                    _outputRootProof.messagePasserStorageRoot,
                     _outputRootProof.latestBlockhash
                 )
             );

packages/contracts-bedrock/contracts/universal/ProxyAdmin.sol

@@ -240,6 +240,7 @@ contract ProxyAdmin is Owned {
             Proxy(_proxy).upgradeTo(_implementation);
         } else if (ptype == ProxyType.CHUGSPLASH) {
             L1ChugSplashProxy(_proxy).setStorage(
+                // bytes32(uint256(keccak256('eip1967.proxy.implementation')) - 1)
                 0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc,
                 bytes32(uint256(uint160(_implementation)))
             );
@@ -247,7 +248,9 @@ contract ProxyAdmin is Owned {
             string memory name = implementationName[_proxy];
             addressManager.setAddress(name, _implementation);
         } else {
-            revert("ProxyAdmin: unknown proxy type");
+            // It should not be possible to retrieve a ProxyType value which is not matched by
+            // one of the previous conditions.
+            assert(false);
         }
     }
 }

packages/contracts-bedrock/deploy-config/devnetL1.json

@@ -14,7 +14,7 @@
   "l2OutputOracleSubmissionInterval": 20,
   "l2OutputOracleStartingTimestamp": -1,
   "l2OutputOracleProposer": "0x70997970C51812dc3A010C7d01b50e0d17dc79C8",
-  "l2OutputOracleOwner": "0x70997970C51812dc3A010C7d01b50e0d17dc79C8",
+  "l2OutputOracleOwner": "0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65",
   "l2GenesisBlockCoinbase": "0x42000000000000000000000000000000000000f0",
 
   "l1BlockTime": 15,

packages/contracts-bedrock/scripts/differential-testing.ts

@@ -146,7 +146,7 @@ const command = args[0]
     case 'hashOutputRootProof': {
       const version = hexZeroPad(BigNumber.from(args[1]).toHexString(), 32)
       const stateRoot = hexZeroPad(BigNumber.from(args[2]).toHexString(), 32)
-      const withdrawerStorageRoot = hexZeroPad(
+      const messagePasserStorageRoot = hexZeroPad(
         BigNumber.from(args[3]).toHexString(),
         32
       )
@@ -158,7 +158,7 @@ const command = args[0]
       const hash = hashOutputRootProof({
         version,
         stateRoot,
-        withdrawerStorageRoot,
+        messagePasserStorageRoot,
         latestBlockhash,
       })
       const output = utils.defaultAbiCoder.encode(['bytes32'], [hash])
@@ -211,7 +211,7 @@ const command = args[0]
       const outputRoot = hashOutputRootProof({
         version: constants.HashZero,
         stateRoot: bufferToHex(world.root),
-        withdrawerStorageRoot: bufferToHex(storage.root),
+        messagePasserStorageRoot: bufferToHex(storage.root),
         latestBlockhash: constants.HashZero,
       })