Merge pull request #3538 from ethereum-optimism/develop

Trigger Releases

Merge pull request #3538 from ethereum-optimism/develop
Trigger Releases
47a81a77 · Matthew Slipper · GitHub · 798cf02c · e2faaa8b · 47a81a77
Commit 47a81a77 authored Sep 23, 2022 by Matthew Slipper Committed by GitHub Sep 23, 2022
100 changed files
--- a/.changeset/big-schools-explain.md
+++ b/.changeset/big-schools-explain.md
+---
+'@eth-optimism/contracts-bedrock': patch
+---
+
+Clarify intent with mintable token interfaces
--- a/.changeset/brown-tomatoes-behave.md
+++ b/.changeset/brown-tomatoes-behave.md
+---
+'@eth-optimism/sdk': patch
+---
+
+Update for new BedrockMessagePasser contract
--- a/.changeset/clever-spoons-kneel.md
+++ b/.changeset/clever-spoons-kneel.md
+---
+'@eth-optimism/contracts-periphery': major
+'@eth-optimism/integration-tests': patch
+---
+
+Fixes NFT bridge related contracts in response to the OpenZeppelin audit. Updates tests to support these changes, including integration tests.
--- a/.changeset/cool-maps-hang.md
+++ b/.changeset/cool-maps-hang.md
+---
+'@eth-optimism/data-transport-layer': patch
+---
+
+Optimization for mainnet under the assumption that addresses do not change.
--- a/.changeset/cyan-kangaroos-march.md
+++ b/.changeset/cyan-kangaroos-march.md
+---
+'@eth-optimism/ci-builder': patch
+---
+
+Remove ugly shell hack
--- a/.changeset/empty-emus-own.md
+++ b/.changeset/empty-emus-own.md
+---
+'@eth-optimism/ci-builder': patch
+---
+
+Fix codecov download step
--- a/.changeset/fast-mails-hope.md
+++ b/.changeset/fast-mails-hope.md
+---
+'@eth-optimism/contracts-bedrock': patch
+---
+
+Fixes to natspec docs
--- a/.changeset/five-laws-drop.md
+++ b/.changeset/five-laws-drop.md
+---
+'@eth-optimism/contracts-periphery': patch
+---
+
+Remove ERC721Refunded events
--- a/.changeset/funny-mirrors-return.md
+++ b/.changeset/funny-mirrors-return.md
+---
+'@eth-optimism/fault-detector': minor
+---
+
+Updates metrics to use better labels.
--- a/.changeset/moody-cobras-visit.md
+++ b/.changeset/moody-cobras-visit.md
+---
+'@eth-optimism/contracts-bedrock': minor
+---
+
+Moves the L2ToL1MessagePasser to a new address and puts a LegacyMessagePasser at the old address.
--- a/.changeset/polite-weeks-cheat.md
+++ b/.changeset/polite-weeks-cheat.md
+---
+'@eth-optimism/contracts-bedrock': patch
+---
+
+Tweaks storage spacers to standardize names and use original types
--- a/.changeset/proud-steaks-shave.md
+++ b/.changeset/proud-steaks-shave.md
+---
+'@eth-optimism/contracts-bedrock': patch
+---
+
+Fix event names orderings for `OptimismMintableERC20Created`
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -153,7 +153,7 @@ jobs:
      - run:
          name: upload coverage
          command: |
-           ./codecov --verbose || exit 0
+            codecov --verbose || exit 0
          environment:
            FOUNDRY_PROFILE: ci
      - run:
@@ -228,6 +228,7 @@ jobs:
  bedrock-go-tests:
    docker:
      - image: ethereumoptimism/ci-builder:latest
+    resource_class: xlarge
    steps:
      - checkout
      - run:
@@ -309,7 +310,7 @@ jobs:
      - run:
          name: Upload coverage reports to CodeCov
          command: |
-            ./codecov --verbose || exit 0
+            codecov --verbose || exit 0
      - store_test_results:
          path: /test-results
      - run:

--- a/Makefile
+++ b/Makefile
@@ -110,4 +110,8 @@ clean-node-modules:

 tag-bedrock-go-modules:
 	./ops/scripts/tag-bedrock-go-modules.sh $(BEDROCK_TAGS_REMOTE) $(VERSION)
-.PHONY: tag-bedrock-go-modules
\ No newline at end of file
+.PHONY: tag-bedrock-go-modules
+
+update-op-geth:
+	./ops/scripts/update-op-geth.py
+.PHONY: update-op-geth
\ No newline at end of file
--- a/go.work
+++ b/go.work
@@ -9,17 +9,17 @@ use (
 	./l2geth-exporter
 	./op-batcher
 	./op-bindings
+	./op-chain-ops
 	./op-e2e
 	./op-exporter
 	./op-node
 	./op-proposer
 	./op-service
 	./proxyd
-	./op-chain-ops
 	./teleportr
 )

-replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220909213840-e6575c0168f1
+replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73

 // For local debugging:
 //replace github.com/ethereum/go-ethereum v1.10.23 => ../go-ethereum
--- a/go.work.sum
+++ b/go.work.sum
@@ -27,6 +27,8 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.m
 github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
 github.com/ethereum-optimism/op-geth v0.0.0-20220904174542-4311f9d2cead/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg=
 github.com/ethereum-optimism/op-geth v0.0.0-20220906163738-712cb0a1c140/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg=
+github.com/ethereum-optimism/op-geth v0.0.0-20220909213840-e6575c0168f1 h1:W/ZU6BZH7ilTrpdoJOF9N4OReqXbpeRtUB6klIpEdMA=
+github.com/ethereum-optimism/op-geth v0.0.0-20220909213840-e6575c0168f1/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo=
 github.com/fjl/gencodec v0.0.0-20220412091415-8bb9e558978c/go.mod h1:AzA8Lj6YtixmJWL+wkKoBGsLWy9gFrAzi4g+5bCKwpY=
 github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
 github.com/garslo/gogen v0.0.0-20170306192744-1d203ffc1f61/go.mod h1:Q0X6pkwTILDlzrGEckF6HKjXe48EgsY/l7K7vhY4MW8=

--- a/integration-tests/contracts/FakeOptimismMintableERC721.sol
+++ b/integration-tests/contracts/FakeOptimismMintableERC721.sol
@@ -2,21 +2,29 @@
 pragma solidity ^0.8.9;

 import { ERC721 } from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
+import { OptimismMintableERC721 } from "@eth-optimism/contracts-periphery/contracts/universal/op-erc721/OptimismMintableERC721.sol";
+import { IERC165 } from "@openzeppelin/contracts/utils/introspection/IERC165.sol";

-contract FakeOptimismMintableERC721 is ERC721 {
+contract FakeOptimismMintableERC721 is OptimismMintableERC721 {

-    address public immutable remoteToken;
-    address public immutable bridge;
+    constructor(
+        address _bridge,
+        address _remoteToken,
+        uint256 _remoteChainId
+    ) OptimismMintableERC721(
+        _bridge,
+        _remoteChainId,
+        _remoteToken,
+        "FakeERC721",
+        "FAKE"
+    ) {}

-    constructor(address _remoteToken, address _bridge) ERC721("FakeERC721", "FAKE") {
-        remoteToken = _remoteToken;
-        bridge = _bridge;
-    }
-
-    function mint(address to, uint256 tokenId) public {
-        _mint(to, tokenId);
+    function safeMint(address to, uint256 tokenId) external override {
+        _safeMint(to, tokenId);
    }

    // Burn will be called by the L2 Bridge to burn the NFT we are bridging to L1
-    function burn(address, uint256) external {}
+    function burn(address, uint256 tokenId) external override {
+        _burn(tokenId);
+    }
 }
--- a/integration-tests/test/nft-bridge.spec.ts
+++ b/integration-tests/test/nft-bridge.spec.ts
@@ -3,6 +3,7 @@ import { Contract, ContractFactory, utils, Wallet } from 'ethers'
 import { ethers } from 'hardhat'
 import { getChainId } from '@eth-optimism/core-utils'
 import { predeploys } from '@eth-optimism/contracts'
+import { MessageLike } from '@eth-optimism/sdk'
 import Artifact__TestERC721 from '@eth-optimism/contracts-periphery/artifacts/contracts/testing/helpers/TestERC721.sol/TestERC721.json'
 import Artifact__L1ERC721Bridge from '@eth-optimism/contracts-periphery/artifacts/contracts/L1/L1ERC721Bridge.sol/L1ERC721Bridge.json'
 import Artifact__L2ERC721Bridge from '@eth-optimism/contracts-periphery/artifacts/contracts/L2/L2ERC721Bridge.sol/L2ERC721Bridge.json'
@@ -15,8 +16,11 @@ import { OptimismEnv } from './shared/env'
 import { withdrawalTest } from './shared/utils'

 const TOKEN_ID: number = 1
-const FINALIZATION_GAS: number = 1_200_000
+const FINALIZATION_GAS: number = 600_000
 const NON_NULL_BYTES: string = '0x1111'
+const DUMMY_L1ERC721_ADDRESS: string = ethers.utils.getAddress(
+  '0x' + 'acdc'.repeat(10)
+)

 describe('ERC721 Bridge', () => {
  let env: OptimismEnv
@@ -129,7 +133,6 @@ describe('ERC721 Bridge', () => {
      Artifact__OptimismMintableERC721.abi,
      erc721CreatedEvent.args.localToken
    )
-    await OptimismMintableERC721.deployed()

    // Mint an L1 ERC721 to Bob on L1
    const tx2 = await L1ERC721.mint(bobAddress, TOKEN_ID)
@@ -274,11 +277,18 @@ describe('ERC721 Bridge', () => {
          'FakeOptimismMintableERC721',
          bobWalletL2
        )
-      ).deploy(L1ERC721.address, L2ERC721Bridge.address)
+      ).deploy(
+        L2ERC721Bridge.address,
+        L1ERC721.address,
+        await getChainId(env.l1Wallet.provider)
+      )
      await FakeOptimismMintableERC721.deployed()

      // Use the fake contract to mint Alice an NFT with the same token ID
-      const tx = await FakeOptimismMintableERC721.mint(aliceAddress, TOKEN_ID)
+      const tx = await FakeOptimismMintableERC721.safeMint(
+        aliceAddress,
+        TOKEN_ID
+      )
      await tx.wait()

      // Check that Alice owns the NFT from the fake ERC721 contract
@@ -303,4 +313,61 @@ describe('ERC721 Bridge', () => {
      expect(await L1ERC721.ownerOf(TOKEN_ID)).to.equal(L1ERC721Bridge.address)
    }
  )
+
+  withdrawalTest(
+    'should refund an L2 NFT that fails to be finalized on l1',
+    async () => {
+      // Deploy an L2 native NFT, which:
+      // - Mimics the interface of an OptimismMintableERC721.
+      // - Allows anyone to mint tokens.
+      // - Has a `remoteToken` state variable that returns the address of a non-existent L1 ERC721.
+      //     This will cause the bridge to fail on L1, triggering a refund on L2.
+      const L2NativeNFT = await (
+        await ethers.getContractFactory(
+          'FakeOptimismMintableERC721',
+          aliceWalletL2
+        )
+      ).deploy(
+        L2ERC721Bridge.address,
+        DUMMY_L1ERC721_ADDRESS,
+        await getChainId(env.l1Wallet.provider)
+      )
+      await L2NativeNFT.deployed()
+
+      // Alice mints an NFT from the L2 native ERC721 contract
+      const tx = await L2NativeNFT.safeMint(aliceAddress, TOKEN_ID)
+      await tx.wait()
+
+      // Check that Alice owns the L2 NFT
+      expect(await L2NativeNFT.ownerOf(TOKEN_ID)).to.equal(aliceAddress)
+
+      // Alice bridges her L2 native NFT to L1, which burns the L2 NFT.
+      const withdrawalTx = await L2ERC721Bridge.connect(
+        aliceWalletL2
+      ).bridgeERC721(
+        L2NativeNFT.address,
+        DUMMY_L1ERC721_ADDRESS,
+        TOKEN_ID,
+        FINALIZATION_GAS,
+        NON_NULL_BYTES
+      )
+      await withdrawalTx.wait()
+
+      // Check that the token was burnt on L2 (pre-refund).
+      await expect(L2NativeNFT.ownerOf(TOKEN_ID)).to.be.revertedWith(
+        'ERC721: owner query for nonexistent token'
+      )
+
+      // Relay the cross-domain transaction to L1, which initiates an L1 -> L2 message to refund
+      // Alice her L2 NFT.
+      await env.relayXDomainMessages(withdrawalTx)
+
+      // Wait for the L1 -> L2 message to finalize on L2
+      const txPair = await env.waitForXDomainTransaction(withdrawalTx)
+      await env.messenger.waitForMessageReceipt(txPair.remoteTx as MessageLike)
+
+      // Check that the L2 NFT has been refunded to Alice.
+      expect(await L2NativeNFT.ownerOf(TOKEN_ID)).to.equal(aliceAddress)
+    }
+  )
 })
--- a/op-batcher/go.mod
+++ b/op-batcher/go.mod
@@ -70,4 +70,4 @@ require (
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
 )

-replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220909213840-e6575c0168f1
+replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73
--- a/op-batcher/go.sum
+++ b/op-batcher/go.sum
@@ -147,8 +147,8 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/ethereum-optimism/op-geth v0.0.0-20220909213840-e6575c0168f1 h1:W/ZU6BZH7ilTrpdoJOF9N4OReqXbpeRtUB6klIpEdMA=
-github.com/ethereum-optimism/op-geth v0.0.0-20220909213840-e6575c0168f1/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo=
+github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73 h1:eXnnByFF0QiN1Qrq0wYmvI5lbDM8QQM0pv6AHx2FLnk=
+github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo=
 github.com/ethereum-optimism/optimism/op-bindings v0.8.6 h1:jJYhmygt7hqGzYa+8sme9SdnKt1c3Y6EbWgIrRONoxw=
 github.com/ethereum-optimism/optimism/op-bindings v0.8.6/go.mod h1:gUX5317IAvRMjB4GftayM87JVln3DTqukfirwJpEWnE=
 github.com/ethereum-optimism/optimism/op-node v0.8.6 h1:xNwN+Q/Rt17vSKawhBeG9qTcqcyh8JU8PGjK1iuGkF4=

--- a/op-bindings/Makefile
+++ b/op-bindings/Makefile
@@ -11,6 +11,7 @@ bindings: l1block-bindings \
 	optimism-portal-bindings \
 	l2-output-oracle-bindings \
 	gas-price-oracle-bindings \
+  legacy-message-passer-bindings \
 	address-manager-bindings \
 	l2-cross-domain-messenger-bindings \
 	l2-standard-bridge-bindings \
@@ -76,6 +77,9 @@ proxy-bindings: compile
 proxy-admin-bindings: compile
 	./gen_bindings.sh contracts/universal/ProxyAdmin.sol:ProxyAdmin $(pkg)

+legacy-message-passer-bindings: compile
+	./gen_bindings.sh contracts/legacy/LegacyMessagePasser.sol:LegacyMessagePasser $(pkg)
+
 erc20-bindings: compile
 	./gen_bindings.sh node_modules/@openzeppelin/contracts/token/ERC20/ERC20.sol:ERC20 $(pkg)

@@ -92,7 +96,7 @@ more:
 	go run ./gen/main.go \
 		-artifacts ../packages/contracts-bedrock/artifacts \
 		-out ./bindings \
-		-contracts OptimismMintableERC20Factory,L2StandardBridge,L1BlockNumber,DeployerWhitelist,Proxy,OptimismPortal,L2ToL1MessagePasser,L2CrossDomainMessenger,GasPriceOracle,SequencerFeeVault,L1Block,LegacyERC20ETH,WETH9,GovernanceToken,L1CrossDomainMessenger \
+		-contracts OptimismMintableERC20Factory,L2StandardBridge,L1BlockNumber,LegacyMessagePasser,DeployerWhitelist,Proxy,OptimismPortal,L2ToL1MessagePasser,L2CrossDomainMessenger,GasPriceOracle,SequencerFeeVault,L1Block,LegacyERC20ETH,WETH9,GovernanceToken,L1CrossDomainMessenger \
 		-package bindings

 mkdir:

--- a/op-bindings/bindings/gaspriceoracle_more.go
+++ b/op-bindings/bindings/gaspriceoracle_more.go
@@ -9,7 +9,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-bindings/solc"
 )

-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\"}}}"
+const GasPriceOracleStorageLayoutJSON = "{\"storage\":[{\"astId\":27915,\"contract\":\"contracts/L2/GasPriceOracle.sol:GasPriceOracle\",\"label\":\"_owner\",\"offset\":0,\"slot\":\"0\",\"type\":\"t_address\"},{\"astId\":1754,\"contract\":\"contracts/L2/GasPriceOracle.sol:GasPriceOracle\",\"label\":\"spacer_1_0_32\",\"offset\":0,\"slot\":\"1\",\"type\":\"t_uint256\"},{\"astId\":1757,\"contract\":\"contracts/L2/GasPriceOracle.sol:GasPriceOracle\",\"label\":\"spacer_2_0_32\",\"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)


--- a/op-bindings/bindings/governancetoken_more.go
+++ b/op-bindings/bindings/governancetoken_more.go
@@ -9,7 +9,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-bindings/solc"
 )

-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\"}}}"
+const GovernanceTokenStorageLayoutJSON = "{\"storage\":[{\"astId\":28114,\"contract\":\"contracts/L2/GovernanceToken.sol:GovernanceToken\",\"label\":\"_balances\",\"offset\":0,\"slot\":\"0\",\"type\":\"t_mapping(t_address,t_uint256)\"},{\"astId\":28120,\"contract\":\"contracts/L2/GovernanceToken.sol:GovernanceToken\",\"label\":\"_allowances\",\"offset\":0,\"slot\":\"1\",\"type\":\"t_mapping(t_address,t_mapping(t_address,t_uint256))\"},{\"astId\":28122,\"contract\":\"contracts/L2/GovernanceToken.sol:GovernanceToken\",\"label\":\"_totalSupply\",\"offset\":0,\"slot\":\"2\",\"type\":\"t_uint256\"},{\"astId\":28124,\"contract\":\"contracts/L2/GovernanceToken.sol:GovernanceToken\",\"label\":\"_name\",\"offset\":0,\"slot\":\"3\",\"type\":\"t_string_storage\"},{\"astId\":28126,\"contract\":\"contracts/L2/GovernanceToken.sol:GovernanceToken\",\"label\":\"_symbol\",\"offset\":0,\"slot\":\"4\",\"type\":\"t_string_storage\"},{\"astId\":29491,\"contract\":\"contracts/L2/GovernanceToken.sol:GovernanceToken\",\"label\":\"_nonces\",\"offset\":0,\"slot\":\"5\",\"type\":\"t_mapping(t_address,t_struct(Counter)30280_storage)\"},{\"astId\":29499,\"contract\":\"contracts/L2/GovernanceToken.sol:GovernanceToken\",\"label\":\"_PERMIT_TYPEHASH_DEPRECATED_SLOT\",\"offset\":0,\"slot\":\"6\",\"type\":\"t_bytes32\"},{\"astId\":28832,\"contract\":\"contracts/L2/GovernanceToken.sol:GovernanceToken\",\"label\":\"_delegates\",\"offset\":0,\"slot\":\"7\",\"type\":\"t_mapping(t_address,t_address)\"},{\"astId\":28838,\"contract\":\"contracts/L2/GovernanceToken.sol:GovernanceToken\",\"label\":\"_checkpoints\",\"offset\":0,\"slot\":\"8\",\"type\":\"t_mapping(t_address,t_array(t_struct(Checkpoint)28823_storage)dyn_storage)\"},{\"astId\":28842,\"contract\":\"contracts/L2/GovernanceToken.sol:GovernanceToken\",\"label\":\"_totalSupplyCheckpoints\",\"offset\":0,\"slot\":\"9\",\"type\":\"t_array(t_struct(Checkpoint)28823_storage)dyn_storage\"},{\"astId\":27915,\"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)28823_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)28823_storage)dyn_storage)\":{\"encoding\":\"mapping\",\"label\":\"mapping(address =\u003e struct ERC20Votes.Checkpoint[])\",\"numberOfBytes\":\"32\",\"key\":\"t_address\",\"value\":\"t_array(t_struct(Checkpoint)28823_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)30280_storage)\":{\"encoding\":\"mapping\",\"label\":\"mapping(address =\u003e struct Counters.Counter)\",\"numberOfBytes\":\"32\",\"key\":\"t_address\",\"value\":\"t_struct(Counter)30280_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)28823_storage\":{\"encoding\":\"inplace\",\"label\":\"struct ERC20Votes.Checkpoint\",\"numberOfBytes\":\"32\"},\"t_struct(Counter)30280_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)


--- a/op-bindings/bindings/l1crossdomainmessenger_more.go
+++ b/op-bindings/bindings/l1crossdomainmessenger_more.go
@@ -9,7 +9,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-bindings/solc"
 )

-const L1CrossDomainMessengerStorageLayoutJSON = "{\"storage\":[{\"astId\":24694,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"spacer_0_0_20\",\"offset\":0,\"slot\":\"0\",\"type\":\"t_bytes20\"},{\"astId\":27155,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"_initialized\",\"offset\":20,\"slot\":\"0\",\"type\":\"t_uint8\"},{\"astId\":27158,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"_initializing\",\"offset\":21,\"slot\":\"0\",\"type\":\"t_bool\"},{\"astId\":27769,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"__gap\",\"offset\":0,\"slot\":\"1\",\"type\":\"t_array(t_uint256)50_storage\"},{\"astId\":27027,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"_owner\",\"offset\":0,\"slot\":\"51\",\"type\":\"t_address\"},{\"astId\":27147,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"__gap\",\"offset\":0,\"slot\":\"52\",\"type\":\"t_array(t_uint256)49_storage\"},{\"astId\":27320,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"_paused\",\"offset\":0,\"slot\":\"101\",\"type\":\"t_bool\"},{\"astId\":27425,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"__gap\",\"offset\":0,\"slot\":\"102\",\"type\":\"t_array(t_uint256)49_storage\"},{\"astId\":27440,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"_status\",\"offset\":0,\"slot\":\"151\",\"type\":\"t_uint256\"},{\"astId\":27484,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"__gap\",\"offset\":0,\"slot\":\"152\",\"type\":\"t_array(t_uint256)49_storage\"},{\"astId\":24744,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"spacer_201_0_32\",\"offset\":0,\"slot\":\"201\",\"type\":\"t_bytes32\"},{\"astId\":24747,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"spacer_202_0_32\",\"offset\":0,\"slot\":\"202\",\"type\":\"t_bytes32\"},{\"astId\":24752,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"successfulMessages\",\"offset\":0,\"slot\":\"203\",\"type\":\"t_mapping(t_bytes32,t_bool)\"},{\"astId\":24755,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"xDomainMsgSender\",\"offset\":0,\"slot\":\"204\",\"type\":\"t_address\"},{\"astId\":24758,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"msgNonce\",\"offset\":0,\"slot\":\"205\",\"type\":\"t_uint240\"},{\"astId\":24763,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"receivedMessages\",\"offset\":0,\"slot\":\"206\",\"type\":\"t_mapping(t_bytes32,t_bool)\"},{\"astId\":24768,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"__gap\",\"offset\":0,\"slot\":\"207\",\"type\":\"t_array(t_uint256)42_storage\"}],\"types\":{\"t_address\":{\"encoding\":\"inplace\",\"label\":\"address\",\"numberOfBytes\":\"20\"},\"t_array(t_uint256)42_storage\":{\"encoding\":\"inplace\",\"label\":\"uint256[42]\",\"numberOfBytes\":\"1344\"},\"t_array(t_uint256)49_storage\":{\"encoding\":\"inplace\",\"label\":\"uint256[49]\",\"numberOfBytes\":\"1568\"},\"t_array(t_uint256)50_storage\":{\"encoding\":\"inplace\",\"label\":\"uint256[50]\",\"numberOfBytes\":\"1600\"},\"t_bool\":{\"encoding\":\"inplace\",\"label\":\"bool\",\"numberOfBytes\":\"1\"},\"t_bytes20\":{\"encoding\":\"inplace\",\"label\":\"bytes20\",\"numberOfBytes\":\"20\"},\"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_uint240\":{\"encoding\":\"inplace\",\"label\":\"uint240\",\"numberOfBytes\":\"30\"},\"t_uint256\":{\"encoding\":\"inplace\",\"label\":\"uint256\",\"numberOfBytes\":\"32\"},\"t_uint8\":{\"encoding\":\"inplace\",\"label\":\"uint8\",\"numberOfBytes\":\"1\"}}}"
+const L1CrossDomainMessengerStorageLayoutJSON = "{\"storage\":[{\"astId\":24801,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"spacer_0_0_20\",\"offset\":0,\"slot\":\"0\",\"type\":\"t_address\"},{\"astId\":27292,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"_initialized\",\"offset\":20,\"slot\":\"0\",\"type\":\"t_uint8\"},{\"astId\":27295,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"_initializing\",\"offset\":21,\"slot\":\"0\",\"type\":\"t_bool\"},{\"astId\":27906,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"__gap\",\"offset\":0,\"slot\":\"1\",\"type\":\"t_array(t_uint256)50_storage\"},{\"astId\":27164,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"_owner\",\"offset\":0,\"slot\":\"51\",\"type\":\"t_address\"},{\"astId\":27284,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"__gap\",\"offset\":0,\"slot\":\"52\",\"type\":\"t_array(t_uint256)49_storage\"},{\"astId\":27457,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"_paused\",\"offset\":0,\"slot\":\"101\",\"type\":\"t_bool\"},{\"astId\":27562,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"__gap\",\"offset\":0,\"slot\":\"102\",\"type\":\"t_array(t_uint256)49_storage\"},{\"astId\":27577,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"_status\",\"offset\":0,\"slot\":\"151\",\"type\":\"t_uint256\"},{\"astId\":27621,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"__gap\",\"offset\":0,\"slot\":\"152\",\"type\":\"t_array(t_uint256)49_storage\"},{\"astId\":24853,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"spacer_201_0_32\",\"offset\":0,\"slot\":\"201\",\"type\":\"t_mapping(t_bytes32,t_bool)\"},{\"astId\":24858,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"spacer_202_0_32\",\"offset\":0,\"slot\":\"202\",\"type\":\"t_mapping(t_bytes32,t_bool)\"},{\"astId\":24863,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"successfulMessages\",\"offset\":0,\"slot\":\"203\",\"type\":\"t_mapping(t_bytes32,t_bool)\"},{\"astId\":24866,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"xDomainMsgSender\",\"offset\":0,\"slot\":\"204\",\"type\":\"t_address\"},{\"astId\":24869,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"msgNonce\",\"offset\":0,\"slot\":\"205\",\"type\":\"t_uint240\"},{\"astId\":24874,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"receivedMessages\",\"offset\":0,\"slot\":\"206\",\"type\":\"t_mapping(t_bytes32,t_bool)\"},{\"astId\":24879,\"contract\":\"contracts/L1/L1CrossDomainMessenger.sol:L1CrossDomainMessenger\",\"label\":\"__gap\",\"offset\":0,\"slot\":\"207\",\"type\":\"t_array(t_uint256)42_storage\"}],\"types\":{\"t_address\":{\"encoding\":\"inplace\",\"label\":\"address\",\"numberOfBytes\":\"20\"},\"t_array(t_uint256)42_storage\":{\"encoding\":\"inplace\",\"label\":\"uint256[42]\",\"numberOfBytes\":\"1344\"},\"t_array(t_uint256)49_storage\":{\"encoding\":\"inplace\",\"label\":\"uint256[49]\",\"numberOfBytes\":\"1568\"},\"t_array(t_uint256)50_storage\":{\"encoding\":\"inplace\",\"label\":\"uint256[50]\",\"numberOfBytes\":\"1600\"},\"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_uint240\":{\"encoding\":\"inplace\",\"label\":\"uint240\",\"numberOfBytes\":\"30\"},\"t_uint256\":{\"encoding\":\"inplace\",\"label\":\"uint256\",\"numberOfBytes\":\"32\"},\"t_uint8\":{\"encoding\":\"inplace\",\"label\":\"uint8\",\"numberOfBytes\":\"1\"}}}"

 var L1CrossDomainMessengerStorageLayout = new(solc.StorageLayout)


--- a/op-bindings/bindings/l1standardbridge.go
+++ b/op-bindings/bindings/l1standardbridge.go
--- a/op-bindings/bindings/l2crossdomainmessenger.go
+++ b/op-bindings/bindings/l2crossdomainmessenger.go
--- a/op-bindings/bindings/l2crossdomainmessenger_more.go
+++ b/op-bindings/bindings/l2crossdomainmessenger_more.go
--- a/op-bindings/bindings/l2standardbridge.go
+++ b/op-bindings/bindings/l2standardbridge.go
--- a/op-bindings/bindings/l2standardbridge_more.go
+++ b/op-bindings/bindings/l2standardbridge_more.go
--- a/op-bindings/bindings/legacyerc20eth_more.go
+++ b/op-bindings/bindings/legacyerc20eth_more.go
--- a/op-bindings/bindings/legacymessagepasser.go
+++ b/op-bindings/bindings/legacymessagepasser.go
--- a/op-bindings/bindings/legacymessagepasser_more.go
+++ b/op-bindings/bindings/legacymessagepasser_more.go
+// Code generated - DO NOT EDIT.
+// This file is a generated binding and any manual changes will be lost.
+
+package bindings
+
+import (
+	"encoding/json"
+
+	"github.com/ethereum-optimism/optimism/op-bindings/solc"
+)
+
+const LegacyMessagePasserStorageLayoutJSON = "{\"storage\":[{\"astId\":3543,\"contract\":\"contracts/legacy/LegacyMessagePasser.sol:LegacyMessagePasser\",\"label\":\"sentMessages\",\"offset\":0,\"slot\":\"0\",\"type\":\"t_mapping(t_bytes32,t_bool)\"}],\"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\"}}}"
+
+var LegacyMessagePasserStorageLayout = new(solc.StorageLayout)
+
+var LegacyMessagePasserDeployedBin = "0x608060405234801561001057600080fd5b50600436106100415760003560e01c806354fd4d501461004657806382e3702d14610064578063cafa81dc14610097575b600080fd5b61004e6100ac565b60405161005b9190610347565b60405180910390f35b610087610072366004610398565b60006020819052908152604090205460ff1681565b604051901515815260200161005b565b6100aa6100a53660046103e0565b61014f565b005b60606100d77f00000000000000000000000000000000000000000000000000000000000000006101da565b6101007f00000000000000000000000000000000000000000000000000000000000000006101da565b6101297f00000000000000000000000000000000000000000000000000000000000000006101da565b60405160200161013b939291906104af565b604051602081830303815290604052905090565b60016000808333604051602001610167929190610525565b604080518083037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe001815291815281516020928301208352908201929092520160002080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff001691151591909117905550565b60608160000361021d57505060408051808201909152600181527f3000000000000000000000000000000000000000000000000000000000000000602082015290565b8160005b811561024757806102318161059e565b91506102409050600a83610605565b9150610221565b60008167ffffffffffffffff811115610262576102626103b1565b6040519080825280601f01601f19166020018201604052801561028c576020820181803683370190505b5090505b841561030f576102a1600183610619565b91506102ae600a86610630565b6102b9906030610644565b60f81b8183815181106102ce576102ce61065c565b60200101907effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916908160001a905350610308600a86610605565b9450610290565b949350505050565b60005b8381101561033257818101518382015260200161031a565b83811115610341576000848401525b50505050565b6020815260008251806020840152610366816040850160208701610317565b601f017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0169190910160400192915050565b6000602082840312156103aa57600080fd5b5035919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6000602082840312156103f257600080fd5b813567ffffffffffffffff8082111561040a57600080fd5b818401915084601f83011261041e57600080fd5b813581811115610430576104306103b1565b604051601f82017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0908116603f01168101908382118183101715610476576104766103b1565b8160405282815287602084870101111561048f57600080fd5b826020860160208301376000928101602001929092525095945050505050565b600084516104c1818460208901610317565b80830190507f2e0000000000000000000000000000000000000000000000000000000000000080825285516104fd816001850160208a01610317565b60019201918201528351610518816002840160208801610317565b0160020195945050505050565b60008351610537818460208801610317565b60609390931b7fffffffffffffffffffffffffffffffffffffffff000000000000000000000000169190920190815260140192915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82036105cf576105cf61056f565b5060010190565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b600082610614576106146105d6565b500490565b60008282101561062b5761062b61056f565b500390565b60008261063f5761063f6105d6565b500690565b600082198211156106575761065761056f565b500190565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fdfea164736f6c634300080f000a"
+
+func init() {
+	if err := json.Unmarshal([]byte(LegacyMessagePasserStorageLayoutJSON), LegacyMessagePasserStorageLayout); err != nil {
+		panic(err)
+	}
+
+	layouts["LegacyMessagePasser"] = LegacyMessagePasserStorageLayout
+	deployedBytecodes["LegacyMessagePasser"] = LegacyMessagePasserDeployedBin
+}
--- a/op-bindings/bindings/optimismmintableerc20.go
+++ b/op-bindings/bindings/optimismmintableerc20.go
--- a/op-bindings/bindings/optimismmintableerc20factory.go
+++ b/op-bindings/bindings/optimismmintableerc20factory.go
--- a/op-bindings/bindings/optimismmintableerc20factory_more.go
+++ b/op-bindings/bindings/optimismmintableerc20factory_more.go
--- a/op-bindings/bindings/optimismportal_more.go
+++ b/op-bindings/bindings/optimismportal_more.go
@@ -9,7 +9,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-bindings/solc"
 )

-const OptimismPortalStorageLayoutJSON = "{\"storage\":[{\"astId\":27155,\"contract\":\"contracts/L1/OptimismPortal.sol:OptimismPortal\",\"label\":\"_initialized\",\"offset\":0,\"slot\":\"0\",\"type\":\"t_uint8\"},{\"astId\":27158,\"contract\":\"contracts/L1/OptimismPortal.sol:OptimismPortal\",\"label\":\"_initializing\",\"offset\":1,\"slot\":\"0\",\"type\":\"t_bool\"},{\"astId\":1404,\"contract\":\"contracts/L1/OptimismPortal.sol:OptimismPortal\",\"label\":\"params\",\"offset\":0,\"slot\":\"1\",\"type\":\"t_struct(ResourceParams)1374_storage\"},{\"astId\":1409,\"contract\":\"contracts/L1/OptimismPortal.sol:OptimismPortal\",\"label\":\"__gap\",\"offset\":0,\"slot\":\"2\",\"type\":\"t_array(t_uint256)49_storage\"},{\"astId\":982,\"contract\":\"contracts/L1/OptimismPortal.sol:OptimismPortal\",\"label\":\"l2Sender\",\"offset\":0,\"slot\":\"51\",\"type\":\"t_address\"},{\"astId\":995,\"contract\":\"contracts/L1/OptimismPortal.sol:OptimismPortal\",\"label\":\"finalizedWithdrawals\",\"offset\":0,\"slot\":\"52\",\"type\":\"t_mapping(t_bytes32,t_bool)\"}],\"types\":{\"t_address\":{\"encoding\":\"inplace\",\"label\":\"address\",\"numberOfBytes\":\"20\"},\"t_array(t_uint256)49_storage\":{\"encoding\":\"inplace\",\"label\":\"uint256[49]\",\"numberOfBytes\":\"1568\"},\"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_struct(ResourceParams)1374_storage\":{\"encoding\":\"inplace\",\"label\":\"struct ResourceMetering.ResourceParams\",\"numberOfBytes\":\"32\"},\"t_uint128\":{\"encoding\":\"inplace\",\"label\":\"uint128\",\"numberOfBytes\":\"16\"},\"t_uint256\":{\"encoding\":\"inplace\",\"label\":\"uint256\",\"numberOfBytes\":\"32\"},\"t_uint64\":{\"encoding\":\"inplace\",\"label\":\"uint64\",\"numberOfBytes\":\"8\"},\"t_uint8\":{\"encoding\":\"inplace\",\"label\":\"uint8\",\"numberOfBytes\":\"1\"}}}"
+const OptimismPortalStorageLayoutJSON = "{\"storage\":[{\"astId\":27292,\"contract\":\"contracts/L1/OptimismPortal.sol:OptimismPortal\",\"label\":\"_initialized\",\"offset\":0,\"slot\":\"0\",\"type\":\"t_uint8\"},{\"astId\":27295,\"contract\":\"contracts/L1/OptimismPortal.sol:OptimismPortal\",\"label\":\"_initializing\",\"offset\":1,\"slot\":\"0\",\"type\":\"t_bool\"},{\"astId\":1404,\"contract\":\"contracts/L1/OptimismPortal.sol:OptimismPortal\",\"label\":\"params\",\"offset\":0,\"slot\":\"1\",\"type\":\"t_struct(ResourceParams)1374_storage\"},{\"astId\":1409,\"contract\":\"contracts/L1/OptimismPortal.sol:OptimismPortal\",\"label\":\"__gap\",\"offset\":0,\"slot\":\"2\",\"type\":\"t_array(t_uint256)49_storage\"},{\"astId\":982,\"contract\":\"contracts/L1/OptimismPortal.sol:OptimismPortal\",\"label\":\"l2Sender\",\"offset\":0,\"slot\":\"51\",\"type\":\"t_address\"},{\"astId\":995,\"contract\":\"contracts/L1/OptimismPortal.sol:OptimismPortal\",\"label\":\"finalizedWithdrawals\",\"offset\":0,\"slot\":\"52\",\"type\":\"t_mapping(t_bytes32,t_bool)\"}],\"types\":{\"t_address\":{\"encoding\":\"inplace\",\"label\":\"address\",\"numberOfBytes\":\"20\"},\"t_array(t_uint256)49_storage\":{\"encoding\":\"inplace\",\"label\":\"uint256[49]\",\"numberOfBytes\":\"1568\"},\"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_struct(ResourceParams)1374_storage\":{\"encoding\":\"inplace\",\"label\":\"struct ResourceMetering.ResourceParams\",\"numberOfBytes\":\"32\"},\"t_uint128\":{\"encoding\":\"inplace\",\"label\":\"uint128\",\"numberOfBytes\":\"16\"},\"t_uint256\":{\"encoding\":\"inplace\",\"label\":\"uint256\",\"numberOfBytes\":\"32\"},\"t_uint64\":{\"encoding\":\"inplace\",\"label\":\"uint64\",\"numberOfBytes\":\"8\"},\"t_uint8\":{\"encoding\":\"inplace\",\"label\":\"uint8\",\"numberOfBytes\":\"1\"}}}"

 var OptimismPortalStorageLayout = new(solc.StorageLayout)


--- a/op-bindings/go.mod
+++ b/op-bindings/go.mod
@@ -40,6 +40,6 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

-replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220909213840-e6575c0168f1
+replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73

 // github.com/ethereum-optimism/op-geth v0.0.0-20220909213840-e6575c0168f1
--- a/op-bindings/go.sum
+++ b/op-bindings/go.sum
@@ -28,8 +28,8 @@ github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 h1:YLtO71vCjJRCBcrPMtQ9nqBsqpA1
 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw=
-github.com/ethereum-optimism/op-geth v0.0.0-20220909213840-e6575c0168f1 h1:W/ZU6BZH7ilTrpdoJOF9N4OReqXbpeRtUB6klIpEdMA=
-github.com/ethereum-optimism/op-geth v0.0.0-20220909213840-e6575c0168f1/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo=
+github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73 h1:eXnnByFF0QiN1Qrq0wYmvI5lbDM8QQM0pv6AHx2FLnk=
+github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=

--- a/op-bindings/predeploys/addresses.go
+++ b/op-bindings/predeploys/addresses.go
@@ -3,7 +3,7 @@ package predeploys
 import "github.com/ethereum/go-ethereum/common"

 const (
-	L2ToL1MessagePasser          = "0x4200000000000000000000000000000000000000"
+	L2ToL1MessagePasser          = "0x4200000000000000000000000000000000000016"
 	DeployerWhitelist            = "0x4200000000000000000000000000000000000002"
 	LegacyERC20ETH               = "0xDeadDeAddeAddEAddeadDEaDDEAdDeaDDeAD0000"
 	WETH9                        = "0x4200000000000000000000000000000000000006"
@@ -15,6 +15,7 @@ const (
 	GasPriceOracle               = "0x420000000000000000000000000000000000000F"
 	L1Block                      = "0x4200000000000000000000000000000000000015"
 	GovernanceToken              = "0x4200000000000000000000000000000000000042"
+	LegacyMessagePasser          = "0x4200000000000000000000000000000000000000"
 )

 var (
@@ -30,6 +31,7 @@ var (
 	GasPriceOracleAddr               = common.HexToAddress(GasPriceOracle)
 	L1BlockAddr                      = common.HexToAddress(L1Block)
 	GovernanceTokenAddr              = common.HexToAddress(GovernanceToken)
+	LegacyMessagePasserAddr          = common.HexToAddress(LegacyMessagePasser)

 	Predeploys = make(map[string]*common.Address)
 )
@@ -47,4 +49,5 @@ func init() {
 	Predeploys["GasPriceOracle"] = &GasPriceOracleAddr
 	Predeploys["L1Block"] = &L1BlockAddr
 	Predeploys["GovernanceToken"] = &GovernanceTokenAddr
+	Predeploys["LegacyMessagePasser"] = &LegacyMessagePasserAddr
 }
--- a/op-chain-ops/cmd/withdrawals/main.go
+++ b/op-chain-ops/cmd/withdrawals/main.go
+package main
+
+import (
+	"encoding/json"
+	"errors"
+	"os"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/mattn/go-isatty"
+	"github.com/urfave/cli/v2"
+
+	"github.com/ethereum-optimism/optimism/op-chain-ops/crossdomain"
+)
+
+// TODO(tynes): handle connecting directly to a LevelDB based StateDB
+func main() {
+	log.Root().SetHandler(log.StreamHandler(os.Stderr, log.TerminalFormat(isatty.IsTerminal(os.Stderr.Fd()))))
+
+	app := &cli.App{
+		Name:  "withdrawals",
+		Usage: "fetches all pending withdrawals",
+		Flags: []cli.Flag{
+			&cli.StringFlag{
+				Name:  "l1-rpc-url",
+				Value: "http://127.0.0.1:8545",
+				Usage: "RPC URL for an L1 Node",
+			},
+			&cli.StringFlag{
+				Name:  "l2-rpc-url",
+				Value: "http://127.0.0.1:9545",
+				Usage: "RPC URL for an L2 Node",
+			},
+			&cli.StringFlag{
+				Name:  "l1-cross-domain-messenger-address",
+				Usage: "Address of the L1CrossDomainMessenger",
+			},
+			&cli.Uint64Flag{
+				Name:  "start",
+				Usage: "Start height to search for events",
+			},
+			&cli.Uint64Flag{
+				Name:  "end",
+				Usage: "End height to search for events",
+			},
+			&cli.StringFlag{
+				Name:  "outfile",
+				Usage: "Path to output file",
+				Value: "out.json",
+			},
+		},
+		Action: func(ctx *cli.Context) error {
+			l1RpcURL := ctx.String("l1-rpc-url")
+			l2RpcURL := ctx.String("l2-rpc-url")
+
+			l1Client, err := ethclient.Dial(l1RpcURL)
+			if err != nil {
+				return err
+			}
+			l2Client, err := ethclient.Dial(l2RpcURL)
+			if err != nil {
+				return err
+			}
+
+			backends := crossdomain.NewBackends(l1Client, l2Client)
+
+			l1xDomainMessenger := ctx.String("l1-cross-domain-messenger-address")
+			if l1xDomainMessenger == "" {
+				return errors.New("Must pass in L1CrossDomainMessenger address")
+			}
+
+			l1xDomainMessengerAddr := common.HexToAddress(l1xDomainMessenger)
+			messengers, err := crossdomain.NewMessengers(backends, l1xDomainMessengerAddr)
+			if err != nil {
+				return err
+			}
+
+			start := ctx.Uint64("start")
+			end := ctx.Uint64("end")
+
+			// All messages are expected to be version 0 messages
+			withdrawals, err := crossdomain.GetPendingWithdrawals(messengers, common.Big0, start, end)
+			if err != nil {
+				return err
+			}
+
+			outfile := ctx.String("outfile")
+			if err := writeJSONFile(outfile, withdrawals); err != nil {
+				return err
+			}
+
+			return nil
+		},
+	}
+
+	if err := app.Run(os.Args); err != nil {
+		log.Crit("error in migration", "err", err)
+	}
+}
+
+func writeJSONFile(outfile string, input interface{}) error {
+	f, err := os.OpenFile(outfile, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
+	if err != nil {
+		return err
+	}
+	defer f.Close()
+
+	enc := json.NewEncoder(f)
+	enc.SetIndent("", "  ")
+	return enc.Encode(input)
+}
--- a/op-chain-ops/crossdomain/withdrawals.go
+++ b/op-chain-ops/crossdomain/withdrawals.go
+package crossdomain
+
+import (
+	"fmt"
+	"math/big"
+
+	"github.com/ethereum-optimism/optimism/op-bindings/bindings"
+	"github.com/ethereum-optimism/optimism/op-bindings/predeploys"
+
+	"github.com/ethereum/go-ethereum/accounts/abi/bind"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/log"
+)
+
+// A PendingWithdrawal represents a withdrawal that has
+// not been finalized on L1
+type PendingWithdrawal struct {
+	Target          common.Address `json:"target"`
+	Sender          common.Address `json:"sender"`
+	Message         []byte         `json:"message"`
+	MessageNonce    *big.Int       `json:"nonce"`
+	GasLimit        *big.Int       `json:"gasLimit"`
+	TransactionHash common.Hash    `json:"transactionHash"`
+}
+
+// Backends represents a set of backends for L1 and L2.
+// These are used as the backends for the Messengers
+type Backends struct {
+	L1 bind.ContractBackend
+	L2 bind.ContractBackend
+}
+
+func NewBackends(l1, l2 bind.ContractBackend) *Backends {
+	return &Backends{
+		L1: l1,
+		L2: l2,
+	}
+}
+
+// Messengers represents a pair of L1 and L2 cross domain messengers
+// that are connected to the correct contract addresses
+type Messengers struct {
+	L1 *bindings.L1CrossDomainMessenger
+	L2 *bindings.L2CrossDomainMessenger
+}
+
+// NewMessengers constructs Messengers. Passing in the address of the
+// L1CrossDomainMessenger is required to connect to the
+func NewMessengers(backends *Backends, l1CrossDomainMessenger common.Address) (*Messengers, error) {
+	l1Messenger, err := bindings.NewL1CrossDomainMessenger(l1CrossDomainMessenger, backends.L1)
+	if err != nil {
+		return nil, err
+	}
+	l2Messenger, err := bindings.NewL2CrossDomainMessenger(predeploys.L2CrossDomainMessengerAddr, backends.L2)
+	if err != nil {
+		return nil, err
+	}
+
+	return &Messengers{
+		L1: l1Messenger,
+		L2: l2Messenger,
+	}, nil
+}
+
+// GetPendingWithdrawals will fetch pending withdrawals by getting
+// L2CrossDomainMessenger `SentMessage` events and then checking to see if the
+// cross domain message hash has been finalized on L1. It will return a slice of
+// PendingWithdrawals that have not been finalized on L1.
+func GetPendingWithdrawals(messengers *Messengers, version *big.Int, start, end uint64) ([]PendingWithdrawal, error) {
+	withdrawals := make([]PendingWithdrawal, 0)
+
+	// This will not take into account "pending" state, this ensures that
+	// transactions in the mempool are upgraded as well.
+	opts := bind.FilterOpts{
+		Start: start,
+	}
+	// Only set the end block range if end is non zero. When end is zero, the
+	// filter will extend to the latest block.
+	if end != 0 {
+		opts.End = &end
+	}
+
+	messages, err := messengers.L2.FilterSentMessage(&opts, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	defer messages.Close()
+	for messages.Next() {
+		event := messages.Event
+
+		msg := NewCrossDomainMessage(
+			event.MessageNonce,
+			&event.Sender,
+			&event.Target,
+			common.Big0,
+			event.GasLimit,
+			event.Message,
+		)
+
+		// Optional version check
+		if version != nil {
+			if version.Uint64() != msg.Version() {
+				return nil, fmt.Errorf("expected version %d, got version %d", version, msg.Version())
+			}
+		}
+
+		hash, err := msg.Hash()
+		if err != nil {
+			return nil, err
+		}
+
+		relayed, err := messengers.L1.SuccessfulMessages(&bind.CallOpts{}, hash)
+		if err != nil {
+			return nil, err
+		}
+
+		if !relayed {
+			log.Info("%s not yet relayed", event.Raw.TxHash)
+
+			withdrawal := PendingWithdrawal{
+				Target:          event.Target,
+				Sender:          event.Sender,
+				Message:         event.Message,
+				MessageNonce:    event.MessageNonce,
+				GasLimit:        event.GasLimit,
+				TransactionHash: event.Raw.TxHash,
+			}
+
+			withdrawals = append(withdrawals, withdrawal)
+		} else {
+			log.Info("%s already relayed", event.Raw.TxHash)
+		}
+	}
+	return withdrawals, nil
+}
--- a/op-chain-ops/crossdomain/withdrawals_test.go
+++ b/op-chain-ops/crossdomain/withdrawals_test.go
+package crossdomain_test
+
+import (
+	"context"
+	"math/big"
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/op-bindings/bindings"
+	"github.com/ethereum-optimism/optimism/op-bindings/predeploys"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/crossdomain"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/state"
+	"github.com/stretchr/testify/require"
+
+	"github.com/ethereum/go-ethereum/accounts/abi/bind"
+	"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/ethereum/go-ethereum/core/vm"
+	"github.com/ethereum/go-ethereum/crypto"
+)
+
+var (
+	// testKey is the same test key that geth uses
+	testKey, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291")
+	// chainID is the chain id used for simulated backends
+	chainID = big.NewInt(1337)
+	// testAccount represents the sender account for tests
+	testAccount = crypto.PubkeyToAddress(testKey.PublicKey)
+)
+
+// sendMessageArgs represents the input to `SendMessage`. The value
+// is excluded specifically here because we want to simulate v0 messages
+// as closely as possible.
+type sendMessageArgs struct {
+	Target      common.Address
+	Message     []byte
+	MinGasLimit uint32
+}
+
+// setL1CrossDomainMessenger will set the L1CrossDomainMessenger into
+// a state db that represents L1. It accepts a list of "successfulMessages"
+// to be placed into the state. This allows for a subset of messages that
+// were withdrawn on L2 to be placed into the L1 state to simulate
+// a set of withdrawals that are not finalized on L1
+func setL1CrossDomainMessenger(db vm.StateDB, successful []common.Hash) error {
+	bytecode, err := bindings.GetDeployedBytecode("L1CrossDomainMessenger")
+	if err != nil {
+		return err
+	}
+
+	db.CreateAccount(predeploys.DevL1CrossDomainMessengerAddr)
+	db.SetCode(predeploys.DevL1CrossDomainMessengerAddr, bytecode)
+
+	msgs := make(map[any]any)
+	for _, hash := range successful {
+		msgs[hash] = true
+	}
+
+	return state.SetStorage(
+		"L1CrossDomainMessenger",
+		predeploys.DevL1CrossDomainMessengerAddr,
+		state.StorageValues{
+			"successfulMessages": msgs,
+		},
+		db,
+	)
+}
+
+// setL2CrossDomainMessenger will set the L2CrossDomainMessenger into
+// a state db that represents L2. It does not set any state as the only
+// function called in this test is "sendMessage" which calls a hardcoded
+// address that represents the L2ToL1MessagePasser
+func setL2CrossDomainMessenger(db vm.StateDB) error {
+	bytecode, err := bindings.GetDeployedBytecode("L2CrossDomainMessenger")
+	if err != nil {
+		return err
+	}
+
+	db.CreateAccount(predeploys.L2CrossDomainMessengerAddr)
+	db.SetCode(predeploys.L2CrossDomainMessengerAddr, bytecode)
+
+	return state.SetStorage(
+		"L2CrossDomainMessenger",
+		predeploys.L2CrossDomainMessengerAddr,
+		state.StorageValues{
+			"successfulMessages": map[any]any{},
+		},
+		db,
+	)
+}
+
+// setL2ToL1MessagePasser will set the L2ToL1MessagePasser into a state
+// db that represents L2. This must be set so the L2CrossDomainMessenger
+// can call it as part of "sendMessage"
+func setL2ToL1MessagePasser(db vm.StateDB) error {
+	bytecode, err := bindings.GetDeployedBytecode("L2ToL1MessagePasser")
+	if err != nil {
+		return err
+	}
+
+	db.CreateAccount(predeploys.L2ToL1MessagePasserAddr)
+	db.SetCode(predeploys.L2ToL1MessagePasserAddr, bytecode)
+
+	return state.SetStorage(
+		"L2ToL1MessagePasser",
+		predeploys.L2ToL1MessagePasserAddr,
+		state.StorageValues{},
+		db,
+	)
+
+}
+
+// sendCrossDomainMessage will send a L2 to L1 cross domain message.
+// The state cannot just be set because logs must be generated by
+// transaction execution
+func sendCrossDomainMessage(
+	l2xdm *bindings.L2CrossDomainMessenger,
+	backend *backends.SimulatedBackend,
+	message *sendMessageArgs,
+	t *testing.T,
+) *crossdomain.CrossDomainMessage {
+	opts, err := bind.NewKeyedTransactorWithChainID(testKey, chainID)
+	require.Nil(t, err)
+
+	tx, err := l2xdm.SendMessage(opts, message.Target, message.Message, message.MinGasLimit)
+	require.Nil(t, err)
+	backend.Commit()
+
+	receipt, err := backend.TransactionReceipt(context.Background(), tx.Hash())
+	require.Nil(t, err)
+
+	abi, _ := bindings.L2CrossDomainMessengerMetaData.GetAbi()
+	var msg crossdomain.CrossDomainMessage
+
+	// Ensure that we see the event so that a default CrossDomainMessage
+	// is not returned
+	seen := false
+
+	// Assume there is only 1 deposit per transaction
+	for _, log := range receipt.Logs {
+		event, _ := abi.EventByID(log.Topics[0])
+		// Not the event we are looking for
+		if event == nil {
+			continue
+		}
+		// Parse the legacy event
+		if event.Name == "SentMessage" {
+			e, _ := l2xdm.ParseSentMessage(*log)
+			msg.Target = &e.Target
+			msg.Sender = &e.Sender
+			msg.Data = e.Message
+			msg.Nonce = e.MessageNonce
+			msg.GasLimit = e.GasLimit
+
+			// Set seen to true to ensure that this event
+			// was observed
+			seen = true
+		}
+		// Parse the new extension event
+		if event.Name == "SentMessageExtension1" {
+			e, _ := l2xdm.ParseSentMessageExtension1(*log)
+			msg.Value = e.Value
+		}
+	}
+
+	require.True(t, seen)
+	return &msg
+}
+
+// TestGetPendingWithdrawals tests the high level function used
+// to fetch pending withdrawals
+func TestGetPendingWithdrawals(t *testing.T) {
+	// Create a L2 db
+	L2db := state.NewMemoryStateDB(nil)
+	// Set the test account and give it a large balance
+	L2db.CreateAccount(testAccount)
+	L2db.AddBalance(testAccount, big.NewInt(10000000000000000))
+	// Set the L2ToL1MessagePasser in the L2 state
+	err := setL2ToL1MessagePasser(L2db)
+	require.Nil(t, err)
+	// Set the L2CrossDomainMessenger in the L2 state
+	err = setL2CrossDomainMessenger(L2db)
+	require.Nil(t, err)
+
+	L2 := backends.NewSimulatedBackend(
+		L2db.Genesis().Alloc,
+		15000000,
+	)
+
+	L2CrossDomainMessenger, err := bindings.NewL2CrossDomainMessenger(
+		predeploys.L2CrossDomainMessengerAddr,
+		L2,
+	)
+	require.Nil(t, err)
+
+	// Create a set of test data that is made up of cross domain messages.
+	// There is a total of 6 cross domain messages. 3 of them are set to be
+	// finalized on L1 so 3 of them will be considered not finalized.
+	msgs := []*sendMessageArgs{
+		{
+			Target:      common.Address{},
+			Message:     []byte{},
+			MinGasLimit: 0,
+		},
+		{
+			Target:      common.Address{0x01},
+			Message:     []byte{0x01},
+			MinGasLimit: 0,
+		},
+		{
+			Target:      common.Address{},
+			Message:     []byte{},
+			MinGasLimit: 100,
+		},
+		{
+			Target:      common.Address{19: 0x01},
+			Message:     []byte{0xaa, 0xbb},
+			MinGasLimit: 10000,
+		},
+		{
+			Target:      common.HexToAddress("0x4675C7e5BaAFBFFbca748158bEcBA61ef3b0a263"),
+			Message:     hexutil.MustDecode("0x095ea7b3000000000000000000000000c92e8bdf79f0507f65a392b0ab4667716bfe01100000000000000000000000000000000000000000000000000000000000000000"),
+			MinGasLimit: 50000,
+		},
+		{
+			Target:      common.HexToAddress("0xDAFEA492D9c6733ae3d56b7Ed1ADB60692c98Bc5"),
+			Message:     []byte{},
+			MinGasLimit: 70511,
+		},
+	}
+
+	// For each test cross domain message, call "sendMessage" on the
+	// L2CrossDomainMessenger and compute the cross domain message hash
+	hashes := make([]common.Hash, len(msgs))
+	for i, msg := range msgs {
+		sent := sendCrossDomainMessage(L2CrossDomainMessenger, L2, msg, t)
+		hash, err := sent.Hash()
+		require.Nil(t, err)
+		hashes[i] = hash
+	}
+
+	// Create a L1 backend with a dev account
+	L1db := state.NewMemoryStateDB(nil)
+	L1db.CreateAccount(testAccount)
+	L1db.AddBalance(testAccount, big.NewInt(10000000000000000))
+
+	// Set the L1CrossDomainMessenger into the L1 state. Only set a subset
+	// of the messages as finalized, the first 3.
+	err = setL1CrossDomainMessenger(L1db, hashes[0:3])
+	require.Nil(t, err)
+
+	L1 := backends.NewSimulatedBackend(
+		L1db.Genesis().Alloc,
+		15000000,
+	)
+
+	backends := crossdomain.NewBackends(L1, L2)
+	messengers, err := crossdomain.NewMessengers(backends, predeploys.DevL1CrossDomainMessengerAddr)
+	require.Nil(t, err)
+
+	// Fetch the pending withdrawals
+	withdrawals, err := crossdomain.GetPendingWithdrawals(messengers, nil, 0, 100)
+	require.Nil(t, err)
+
+	// Since only half of the withdrawals were set as finalized on L1,
+	// the number of pending withdrawals should be 3
+	require.Equal(t, 3, len(withdrawals))
+
+	// The final 3 test cross domain messages should be equal to the
+	// fetched pending withdrawals. This shows that `GetPendingWithdrawals`
+	// fetched the correct messages
+	for i, msg := range msgs[3:] {
+		withdrawal := withdrawals[i]
+
+		require.Equal(t, msg.Target, withdrawal.Target)
+		require.Equal(t, msg.Message, withdrawal.Message)
+		require.Equal(t, uint64(msg.MinGasLimit), withdrawal.GasLimit.Uint64())
+	}
+}
--- a/op-chain-ops/deployer/deployer.go
+++ b/op-chain-ops/deployer/deployer.go
@@ -5,14 +5,13 @@ import (
 	"fmt"
 	"math/big"

-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/params"
-
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/params"
 )

 // TestKey is the same test key that geth uses
@@ -39,14 +38,17 @@ type Deployment struct {
 type Deployer func(*backends.SimulatedBackend, *bind.TransactOpts, Constructor) (common.Address, error)

 func NewBackend() *backends.SimulatedBackend {
-	return backends.NewSimulatedBackendWithCacheConfig(
-		&core.CacheConfig{
+	return backends.NewSimulatedBackendWithOpts(
+		backends.WithCacheConfig(&core.CacheConfig{
 			Preimages: true,
-		},
-		core.GenesisAlloc{
-			crypto.PubkeyToAddress(TestKey.PublicKey): {Balance: thousandETH},
-		},
-		15000000,
+		}),
+		backends.WithGenesis(core.Genesis{
+			Config: params.AllEthashProtocolChanges,
+			Alloc: core.GenesisAlloc{
+				crypto.PubkeyToAddress(TestKey.PublicKey): {Balance: thousandETH},
+			},
+			GasLimit: 15000000,
+		}),
 	)
 }


--- a/op-chain-ops/genesis/layer_two_test.go
+++ b/op-chain-ops/genesis/layer_two_test.go
@@ -77,7 +77,7 @@ func TestBuildL2DeveloperGenesis(t *testing.T) {
 		require.Equal(t, adminSlot, proxyAdmin.Address.Hash())
 		require.Equal(t, account.Code, depB)
 	}
-	require.Equal(t, 2337, len(gen.Alloc))
+	require.Equal(t, 2338, len(gen.Alloc))

 	if writeFile {
 		file, _ := json.MarshalIndent(gen, "", " ")
@@ -102,5 +102,5 @@ func TestBuildL2DeveloperGenesisDevAccountsFunding(t *testing.T) {
 		ProxyAdmin: common.Address{},
 	})
 	require.NoError(t, err)
-	require.Equal(t, 2316, len(gen.Alloc))
+	require.Equal(t, 2317, len(gen.Alloc))
 }
--- a/op-chain-ops/genesis/setters.go
+++ b/op-chain-ops/genesis/setters.go
@@ -115,11 +115,11 @@ func SetImplementations(db vm.StateDB, storage state.StorageConfig, immutable im
 	return nil
 }

-// Get the storage layout of the L2ToL1MessagePasser
+// Get the storage layout of the LegacyMessagePasser
 // Iterate over the storage layout to know which storage slots to ignore
 // Iterate over each storage slot, compute the migration
 func MigrateDepositHashes(db vm.StateDB) error {
-	layout, err := bindings.GetStorageLayout("L2ToL1MessagePasser")
+	layout, err := bindings.GetStorageLayout("LegacyMessagePasser")
 	if err != nil {
 		return err
 	}
@@ -136,7 +136,7 @@ func MigrateDepositHashes(db vm.StateDB) error {
 		ignore[encoded] = true
 	}

-	return db.ForEachStorage(predeploys.L2ToL1MessagePasserAddr, func(key, value common.Hash) bool {
+	return db.ForEachStorage(predeploys.LegacyMessagePasserAddr, func(key, value common.Hash) bool {
 		if _, ok := ignore[key]; ok {
 			return true
 		}

--- a/op-chain-ops/go.mod
+++ b/op-chain-ops/go.mod
@@ -58,4 +58,4 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

-replace github.com/ethereum/go-ethereum v1.10.21 => github.com/ethereum-optimism/op-geth v0.0.0-20220904174542-4311f9d2cead
+replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73
--- a/op-chain-ops/go.sum
+++ b/op-chain-ops/go.sum
@@ -172,14 +172,14 @@ github.com/elastic/gosigar v0.12.0/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0
 github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73 h1:eXnnByFF0QiN1Qrq0wYmvI5lbDM8QQM0pv6AHx2FLnk=
+github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo=
 github.com/ethereum-optimism/optimism/l2geth v0.0.0-20220820030939-de38b6f6f77e h1:LUfy9ofKcen9Cm1T9JyGNnrPLR2AmyelFbohS6bs4X8=
 github.com/ethereum-optimism/optimism/l2geth v0.0.0-20220820030939-de38b6f6f77e/go.mod h1:Oj5A6Qs/Ao1SP17i3uKroyhz49q/ehagSXRAlvwaI5Y=
 github.com/ethereum-optimism/optimism/op-bindings v0.8.6 h1:jJYhmygt7hqGzYa+8sme9SdnKt1c3Y6EbWgIrRONoxw=
 github.com/ethereum-optimism/optimism/op-bindings v0.8.6/go.mod h1:gUX5317IAvRMjB4GftayM87JVln3DTqukfirwJpEWnE=
 github.com/ethereum/go-ethereum v1.10.4/go.mod h1:nEE0TP5MtxGzOMd7egIrbPJMQBnhVU3ELNxhBglIzhg=
 github.com/ethereum/go-ethereum v1.10.16/go.mod h1:Anj6cxczl+AHy63o4X9O8yWNHuN5wMpfb8MAnHkWn7Y=
-github.com/ethereum/go-ethereum v1.10.23 h1:Xk8XAT4/UuqcjMLIMF+7imjkg32kfVFKoeyQDaO2yWM=
-github.com/ethereum/go-ethereum v1.10.23/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=
 github.com/fjl/memsize v0.0.1 h1:+zhkb+dhUgx0/e+M8sF0QqiouvMQUiKR+QYvdxIOKcQ=
@@ -193,6 +193,7 @@ github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4
 github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
 github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
 github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww=
+github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 h1:f6D9Hr8xV8uYKlyuj8XIruxlh9WjVjdh1gIicAS7ays=
 github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww=
 github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=
 github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=
@@ -574,6 +575,7 @@ github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3
 github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q=
+github.com/status-im/keycard-go v0.0.0-20211109104530-b0e0482ba91d h1:vmirMegf1vqPJ+lDBxLQ0MAt3tz+JL57UPxu44JBOjA=
 github.com/status-im/keycard-go v0.0.0-20211109104530-b0e0482ba91d/go.mod h1:97vT0Rym0wCnK4B++hNA3nCetr0Mh1KXaVxzSt1arjg=
 github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570 h1:gIlAHnH1vJb5vwEjIp5kBj/eu99p/bl0Ay2goiPe5xE=
 github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570/go.mod h1:8OR4w3TdeIHIh1g6EMY5p0gVNOovcWC+1vpc7naMuAw=
@@ -608,6 +610,7 @@ github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//
 github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs=
+github.com/tyler-smith/go-bip39 v1.1.0 h1:5eUemwrMargf3BSLRRCalXT93Ns6pQJIjYQN2nyfOP8=
 github.com/tyler-smith/go-bip39 v1.1.0/go.mod h1:gUYDtqQw1JS3ZJ8UWVcGTGqqr6YIN3CWg+kkNaLt55U=
 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
@@ -818,6 +821,7 @@ golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxb
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 h1:M73Iuj3xbbb9Uk1DYhzydthsj6oOd6l9bpuFcNoUvTs=
 golang.org/x/time v0.0.0-20220224211638-0e9765cccd65/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

--- a/op-chain-ops/immutables/immutables.go
+++ b/op-chain-ops/immutables/immutables.go
@@ -59,6 +59,9 @@ func BuildOptimism(immutable ImmutableConfig) (DeploymentResults, error) {
 		{
 			Name: "DeployerWhitelist",
 		},
+		{
+			Name: "LegacyMessagePasser",
+		},
 		{
 			Name: "L1BlockNumber",
 		},
@@ -115,6 +118,8 @@ func l2Deployer(backend *backends.SimulatedBackend, opts *bind.TransactOpts, dep
 		addr, _, _, err = bindings.DeployOptimismMintableERC20Factory(opts, backend, predeploys.L2StandardBridgeAddr)
 	case "DeployerWhitelist":
 		addr, _, _, err = bindings.DeployDeployerWhitelist(opts, backend)
+	case "LegacyMessagePasser":
+		addr, _, _, err = bindings.DeployLegacyMessagePasser(opts, backend)
 	case "L1BlockNumber":
 		addr, _, _, err = bindings.DeployL1BlockNumber(opts, backend)
 	default:

--- a/op-chain-ops/immutables/immutables_test.go
+++ b/op-chain-ops/immutables/immutables_test.go
@@ -29,6 +29,7 @@ func TestBuildOptimism(t *testing.T) {
 		"SequencerFeeVault":            true,
 		"OptimismMintableERC20Factory": true,
 		"DeployerWhitelist":            true,
+		"LegacyMessagePasser":          true,
 		"L1BlockNumber":                true,
 	}


--- a/op-e2e/go.mod
+++ b/op-e2e/go.mod
@@ -155,4 +155,4 @@ require (
 	lukechampine.com/blake3 v1.1.7 // indirect
 )

-replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220909213840-e6575c0168f1
+replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73
--- a/op-e2e/go.sum
+++ b/op-e2e/go.sum
@@ -239,8 +239,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/ethereum-optimism/op-geth v0.0.0-20220909213840-e6575c0168f1 h1:W/ZU6BZH7ilTrpdoJOF9N4OReqXbpeRtUB6klIpEdMA=
-github.com/ethereum-optimism/op-geth v0.0.0-20220909213840-e6575c0168f1/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo=
+github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73 h1:eXnnByFF0QiN1Qrq0wYmvI5lbDM8QQM0pv6AHx2FLnk=
+github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo=
 github.com/ethereum-optimism/optimism/op-batcher v0.8.6 h1:phRqDO8qUIzJzRYt4+ZivSQx4gENeVcTiHY7wj4TnN4=
 github.com/ethereum-optimism/optimism/op-batcher v0.8.6/go.mod h1:Ghz9Ilox6Ca5TjJAroZVheCleE5a/Ek4qjlW1yULb+A=
 github.com/ethereum-optimism/optimism/op-bindings v0.8.6 h1:jJYhmygt7hqGzYa+8sme9SdnKt1c3Y6EbWgIrRONoxw=

--- a/op-node/cmd/stateviz/assets/main.js
+++ b/op-node/cmd/stateviz/assets/main.js
@@ -69,7 +69,7 @@ async function pageTable() {
                            <th scope="col">L1Head</th>
                            <th scope="col">L1Current</th>
                            <th scope="col">L2Head</th>
-                            <th scope="col">L2SafeHead</th>
+                            <th scope="col">L2Safe</th>
                            <th scope="col">L2FinalizedHead</th>
                        </tr>
                    </thead>
@@ -100,8 +100,8 @@ async function pageTable() {
                        <td title="${tooltipFormat(e.l2Head)}" data-bs-html="true" data-toggle="tooltip" style="background-color:${colorCode(e.l2Head.hash)};">
                            ${prettyHex(e.l2Head.hash)}
                        </td>
-                        <td title="${tooltipFormat(e.l2SafeHead)}" data-bs-html="true" data-toggle="tooltip" style="background-color:${colorCode(e.l2SafeHead.hash)};">
-                            ${prettyHex(e.l2SafeHead.hash)}
+                        <td title="${tooltipFormat(e.l2Safe)}" data-bs-html="true" data-toggle="tooltip" style="background-color:${colorCode(e.l2Safe.hash)};">
+                            ${prettyHex(e.l2Safe.hash)}
                        </td>
                        <td title="${tooltipFormat(e.l2FinalizedHead)}" data-bs-html="true" data-toggle="tooltip" style="background-color:${colorCode(e.l2FinalizedHead.hash)};">
                            ${prettyHex(e.l2FinalizedHead.hash)}

--- a/op-node/cmd/stateviz/main.go
+++ b/op-node/cmd/stateviz/main.go
@@ -42,7 +42,7 @@ type SnapshotState struct {
 	L1Head          eth.L1BlockRef `json:"l1Head"`          // what we see as head on L1
 	L1Current       eth.L1BlockRef `json:"l1Current"`       // l1 block that the derivation is currently using
 	L2Head          eth.L2BlockRef `json:"l2Head"`          // l2 block that was last optimistically accepted (unsafe head)
-	L2SafeHead      eth.L2BlockRef `json:"l2SafeHead"`      // l2 block that was last derived
+	L2Safe          eth.L2BlockRef `json:"l2Safe"`          // l2 block that was last derived
 	L2FinalizedHead eth.BlockID    `json:"l2FinalizedHead"` // l2 block that is irreversible
 }

@@ -54,7 +54,7 @@ func (e *SnapshotState) UnmarshalJSON(data []byte) error {
 		L1Head          json.RawMessage `json:"l1Head"`
 		L1Current       json.RawMessage `json:"l1Current"`
 		L2Head          json.RawMessage `json:"l2Head"`
-		L2SafeHead      json.RawMessage `json:"l2SafeHead"`
+		L2Safe          json.RawMessage `json:"l2Safe"`
 		L2FinalizedHead json.RawMessage `json:"l2FinalizedHead"`
 	}{}
 	if err := json.Unmarshal(data, &t); err != nil {
@@ -78,7 +78,7 @@ func (e *SnapshotState) UnmarshalJSON(data []byte) error {
 	if err := json.Unmarshal(unquote(t.L2Head), &e.L2Head); err != nil {
 		return err
 	}
-	if err := json.Unmarshal(unquote(t.L2SafeHead), &e.L2SafeHead); err != nil {
+	if err := json.Unmarshal(unquote(t.L2Safe), &e.L2Safe); err != nil {
 		return err
 	}
 	if err := json.Unmarshal(unquote(t.L2FinalizedHead), &e.L2FinalizedHead); err != nil {

--- a/op-node/eth/ssz.go
+++ b/op-node/eth/ssz.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"math"
 	"sync"
 )

@@ -18,6 +19,10 @@ const executionPayloadFixedPart = 32 + 20 + 32 + 32 + 256 + 32 + 8 + 8 + 8 + 8 +
 // MAX_TRANSACTIONS_PER_PAYLOAD in consensus spec
 const maxTransactionsPerPayload = 1 << 20

+// ErrExtraDataTooLarge occurs when the ExecutionPayload's ExtraData field
+// is too large to be properly represented in SSZ.
+var ErrExtraDataTooLarge = errors.New("extra data too large")
+
 // The payloads are small enough to read and write at once.
 // But this happens often enough that we want to avoid re-allocating buffers for this.
 var payloadBufPool = sync.Pool{New: func() any {
@@ -57,6 +62,10 @@ func unmarshalBytes32LE(in []byte, z *Uint256Quantity) {

 // MarshalSSZ encodes the ExecutionPayload as SSZ type
 func (payload *ExecutionPayload) MarshalSSZ(w io.Writer) (n int, err error) {
+	if len(payload.ExtraData) > math.MaxUint32-executionPayloadFixedPart {
+		return 0, ErrExtraDataTooLarge
+	}
+
 	scope := payload.SizeSSZ()

 	buf := *payloadBufPool.Get().(*[]byte)

--- a/op-node/eth/ssz_test.go
+++ b/op-node/eth/ssz_test.go
@@ -3,6 +3,7 @@ package eth
 import (
 	"bytes"
 	"encoding/binary"
+	"math"
 	"testing"

 	"github.com/google/go-cmp/cmp"
@@ -124,3 +125,25 @@ func TestOPB01(t *testing.T) {
 	err = unmarshalled.UnmarshalSSZ(uint32(len(data)), bytes.NewReader(data))
 	require.Equal(t, ErrBadTransactionOffset, err)
 }
+
+// TestOPB04 verifies that the SSZ marshaling code
+// properly returns an error when the ExtraData field
+// cannot be represented in the outputted SSZ.
+func TestOPB04(t *testing.T) {
+	// First, test the maximum len - which in this case is the max uint32
+	// minus the execution payload fixed part.
+	payload := &ExecutionPayload{
+		ExtraData: make([]byte, math.MaxUint32-executionPayloadFixedPart),
+	}
+	var buf bytes.Buffer
+	_, err := payload.MarshalSSZ(&buf)
+	require.NoError(t, err)
+	buf.Reset()
+
+	payload = &ExecutionPayload{
+		ExtraData: make([]byte, math.MaxUint32-executionPayloadFixedPart+1),
+	}
+	_, err = payload.MarshalSSZ(&buf)
+	require.Error(t, err)
+	require.Equal(t, ErrExtraDataTooLarge, err)
+}
--- a/op-node/go.mod
+++ b/op-node/go.mod
@@ -159,4 +159,4 @@ require (
 	lukechampine.com/blake3 v1.1.7 // indirect
 )

-replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220909213840-e6575c0168f1
+replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73
--- a/op-node/go.sum
+++ b/op-node/go.sum
@@ -188,8 +188,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/ethereum-optimism/op-geth v0.0.0-20220909213840-e6575c0168f1 h1:W/ZU6BZH7ilTrpdoJOF9N4OReqXbpeRtUB6klIpEdMA=
-github.com/ethereum-optimism/op-geth v0.0.0-20220909213840-e6575c0168f1/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo=
+github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73 h1:eXnnByFF0QiN1Qrq0wYmvI5lbDM8QQM0pv6AHx2FLnk=
+github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo=
 github.com/ethereum-optimism/optimism/op-bindings v0.8.6 h1:jJYhmygt7hqGzYa+8sme9SdnKt1c3Y6EbWgIrRONoxw=
 github.com/ethereum-optimism/optimism/op-bindings v0.8.6/go.mod h1:gUX5317IAvRMjB4GftayM87JVln3DTqukfirwJpEWnE=
 github.com/ethereum-optimism/optimism/op-chain-ops v0.8.6 h1:tNGW3gztoIx2t+z64wAkDIvsUpvc468Y8IG9K4/hAKk=

--- a/op-proposer/go.mod
+++ b/op-proposer/go.mod
@@ -76,4 +76,4 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

-replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220909213840-e6575c0168f1
+replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73
--- a/op-proposer/go.sum
+++ b/op-proposer/go.sum
@@ -148,8 +148,8 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/ethereum-optimism/op-geth v0.0.0-20220909213840-e6575c0168f1 h1:W/ZU6BZH7ilTrpdoJOF9N4OReqXbpeRtUB6klIpEdMA=
-github.com/ethereum-optimism/op-geth v0.0.0-20220909213840-e6575c0168f1/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo=
+github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73 h1:eXnnByFF0QiN1Qrq0wYmvI5lbDM8QQM0pv6AHx2FLnk=
+github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo=
 github.com/ethereum-optimism/optimism/op-bindings v0.8.6 h1:jJYhmygt7hqGzYa+8sme9SdnKt1c3Y6EbWgIrRONoxw=
 github.com/ethereum-optimism/optimism/op-bindings v0.8.6/go.mod h1:gUX5317IAvRMjB4GftayM87JVln3DTqukfirwJpEWnE=
 github.com/ethereum-optimism/optimism/op-node v0.8.6 h1:xNwN+Q/Rt17vSKawhBeG9qTcqcyh8JU8PGjK1iuGkF4=

--- a/op-service/go.mod
+++ b/op-service/go.mod
@@ -65,4 +65,4 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

-replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220909213840-e6575c0168f1
+replace github.com/ethereum/go-ethereum v1.10.23 => github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73
--- a/op-service/go.sum
+++ b/op-service/go.sum
@@ -108,8 +108,8 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/ethereum-optimism/op-geth v0.0.0-20220909213840-e6575c0168f1 h1:W/ZU6BZH7ilTrpdoJOF9N4OReqXbpeRtUB6klIpEdMA=
-github.com/ethereum-optimism/op-geth v0.0.0-20220909213840-e6575c0168f1/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo=
+github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73 h1:eXnnByFF0QiN1Qrq0wYmvI5lbDM8QQM0pv6AHx2FLnk=
+github.com/ethereum-optimism/op-geth v0.0.0-20220921202220-511148385c73/go.mod h1:/6CsT5Ceen2WPLI/oCA3xMcZ5sWMF/D46SjM/ayY0Oo=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fjl/memsize v0.0.1 h1:+zhkb+dhUgx0/e+M8sF0QqiouvMQUiKR+QYvdxIOKcQ=
 github.com/fjl/memsize v0.0.1/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=

--- a/ops-bedrock/devnet-up.sh
+++ b/ops-bedrock/devnet-up.sh
@@ -109,7 +109,7 @@ SEQUENCER_BATCH_INBOX_ADDRESS="$(cat $DEVNET/rollup.json | jq -r '.batch_inbox_a
      SEQUENCER_BATCH_INBOX_ADDRESS="$SEQUENCER_BATCH_INBOX_ADDRESS" \
      docker-compose up -d op-proposer op-batcher

-  echo "Bringin up stateviz webserver..."
+  echo "Bringing up stateviz webserver..."
  docker-compose up -d stateviz
 )


--- a/ops/docker/ci-builder/Dockerfile
+++ b/ops/docker/ci-builder/Dockerfile
 FROM debian:bullseye-20220822-slim as foundry-build

+SHELL ["/bin/bash", "-c"]
+
 WORKDIR /opt

 ENV DEBIAN_FRONTEND=noninteractive
@@ -16,10 +18,6 @@ WORKDIR /opt/foundry
 RUN git clone https://github.com/foundry-rs/foundry.git . \
    && git checkout f540aa9ebde88dce720140b332412089c2ee85b6

-# Make sure we use bash instead of sh to get the source
-# command below
-RUN rm /bin/sh && ln -s /bin/bash /bin/sh
-
 RUN source $HOME/.profile && \
    cargo build --release && \
    strip /opt/foundry/target/release/forge && \
@@ -86,10 +84,12 @@ RUN echo "downloading solidity compilers" && \
  rm solc-linux-amd64-v0.8.12+commit.f00d7308

 RUN echo "downloading and verifying Codecov uploader" && \
-  curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --keyring trustedkeys.gpg --import # One-time step && \
+  curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --keyring trustedkeys.gpg --import && \
  curl -Os "https://uploader.codecov.io/latest/linux/codecov" && \
  curl -Os "https://uploader.codecov.io/latest/linux/codecov.SHA256SUM" && \
  curl -Os "https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig" && \
  gpgv codecov.SHA256SUM.sig codecov.SHA256SUM && \
  shasum -a 256 -c codecov.SHA256SUM || sha256sum -c codecov.SHA256SUM && \
-  chmod +x codecov
+  cp codecov /usr/local/bin/codecov && \
+  chmod +x /usr/local/bin/codecov  && \
+  rm codecov
--- a/ops/scripts/update-op-geth.py
+++ b/ops/scripts/update-op-geth.py
+#!/usr/bin/env python3
+
+
+import urllib3
+import json
+import subprocess
+import os
+
+
+GETH_VERSION='v1.10.23'
+
+
+def main():
+	for project in ('op-service', 'op-node', 'op-proposer', 'op-batcher', 'op-bindings', 'op-chain-ops', 'op-e2e'):
+		print(f'Updating {project}...')
+		update_mod(project)
+
+	# pull the replacer from one of the modules above, since
+	# go work edit -replace does not resolve the branch name
+	# into a pseudo-version.
+	pv = None
+	with open('./op-service/go.mod') as f:
+		for line in f:
+			if line.startswith(f'replace github.com/ethereum/go-ethereum {GETH_VERSION}'):
+				splits = line.split(' => ')
+				pv = splits[1].strip()
+				pv = pv.split(' ')[1]
+				break
+
+	if pv is None:
+		raise Exception('Pseudo version not found.')
+
+	print('Updating go.work...')
+	subprocess.run([
+		'go',
+		'work',
+		'edit',
+		'-replace',
+		f'github.com/ethereum/go-ethereum@{GETH_VERSION}=github.com/ethereum-optimism/op-geth@{pv}'
+	], cwd=os.path.join(project), check=True)
+
+
+def update_mod(project):
+	print('Replacing...')
+	subprocess.run([
+		'go',
+		'mod',
+		'edit',
+		'-replace',
+		f'github.com/ethereum/go-ethereum@{GETH_VERSION}=github.com/ethereum-optimism/op-geth@optimism-history'
+	], cwd=os.path.join(project), check=True)
+	print('Tidying...')
+	subprocess.run([
+		'go',
+		'mod',
+		'tidy'
+	], cwd=os.path.join(project), check=True)
+
+
+if __name__ == '__main__':
+	main()
\ No newline at end of file
--- a/packages/contracts-bedrock/.gas-snapshot
+++ b/packages/contracts-bedrock/.gas-snapshot
@@ -65,12 +65,12 @@ L1CrossDomainMessenger_Test:test_L1MessengerTwiceSendMessage() (gas: 1490366)
 L1CrossDomainMessenger_Test:test_L1MessengerUnpause() (gas: 41003)
 L1CrossDomainMessenger_Test:test_L1MessengerXDomainSenderReverts() (gas: 24283)
 L1CrossDomainMessenger_Test:test_L1MessengerxDomainMessageSenderResets() (gas: 81947)
-L1StandardBridge_Test:test_depositERC20() (gas: 572768)
-L1StandardBridge_Test:test_depositERC20To() (gas: 574975)
+L1StandardBridge_Test:test_depositERC20() (gas: 573485)
+L1StandardBridge_Test:test_depositERC20To() (gas: 575692)
 L1StandardBridge_Test:test_depositETH() (gas: 367591)
 L1StandardBridge_Test:test_depositETHTo() (gas: 324772)
-L1StandardBridge_Test:test_finalizeBridgeERC20FailSendBack() (gas: 674547)
-L1StandardBridge_Test:test_finalizeERC20Withdrawal() (gas: 485732)
+L1StandardBridge_Test:test_finalizeBridgeERC20FailSendBack() (gas: 674560)
+L1StandardBridge_Test:test_finalizeERC20Withdrawal() (gas: 486305)
 L1StandardBridge_Test:test_finalizeETHWithdrawal() (gas: 58841)
 L1StandardBridge_Test:test_initialize() (gas: 22127)
 L1StandardBridge_Test:test_onlyEOADepositERC20() (gas: 22376)
@@ -116,13 +116,13 @@ L2OutputOracleUpgradeable_Test:test_initValuesOnProxy() (gas: 39086)
 L2OutputOracleUpgradeable_Test:test_upgrading() (gas: 180632)
 L2StandardBridge_Test:test_ERC20BridgeFailed_whenLocalTokenIsBridge() (gas: 128674)
 L2StandardBridge_Test:test_cannotWithdrawEthWithoutSendingIt() (gas: 21619)
-L2StandardBridge_Test:test_finalizeBridgeERC20FailSendBack() (gas: 493536)
-L2StandardBridge_Test:test_finalizeDeposit() (gas: 94676)
-L2StandardBridge_Test:test_finalizeDeposit_failsToCompleteOutboundTransfer() (gas: 151906)
+L2StandardBridge_Test:test_finalizeBridgeERC20FailSendBack() (gas: 493550)
+L2StandardBridge_Test:test_finalizeDeposit() (gas: 94693)
+L2StandardBridge_Test:test_finalizeDeposit_failsToCompleteOutboundTransfer() (gas: 152465)
 L2StandardBridge_Test:test_initialize() (gas: 10616)
 L2StandardBridge_Test:test_receive() (gas: 132729)
-L2StandardBridge_Test:test_withdraw() (gas: 347942)
-L2StandardBridge_Test:test_withdrawTo() (gas: 348644)
+L2StandardBridge_Test:test_withdraw() (gas: 347956)
+L2StandardBridge_Test:test_withdrawTo() (gas: 348657)
 L2StandardBridge_Test:test_withdraw_onlyEOA() (gas: 251674)
 L2ToL1MessagePasserTest:test_burn() (gas: 113395)
 L2ToL1MessagePasserTest:test_initiateWithdrawal_fromContract() (gas: 72486)
@@ -136,6 +136,7 @@ LegacyERC20ETH_Test:test_metadata() (gas: 15574)
 LegacyERC20ETH_Test:test_mint() (gas: 10627)
 LegacyERC20ETH_Test:test_transfer() (gas: 10829)
 LegacyERC20ETH_Test:test_transferFrom() (gas: 13008)
+LegacyMessagePasser_Test:test_LegacyMessagePasser_passMessageToL1_Succeeds() (gas: 34593)
 OptimismMintableERC20_Test:test_bridge() (gas: 9828)
 OptimismMintableERC20_Test:test_burn() (gas: 52788)
 OptimismMintableERC20_Test:test_burnRevertsFromNotBridge() (gas: 13228)

--- a/packages/contracts-bedrock/.storage-layout
+++ b/packages/contracts-bedrock/.storage-layout
--- a/packages/contracts-bedrock/contracts/L1/L1StandardBridge.sol
+++ b/packages/contracts-bedrock/contracts/L1/L1StandardBridge.sol
@@ -108,7 +108,7 @@ contract L1StandardBridge is StandardBridge, Semver {
     * @param _l2Token   Address of the corresponding token on L2.
     * @param _from      Address of the withdrawer on L2.
     * @param _to        Address of the recipient on L1.
-     * @param _amount    Amount of ETH to withdraw.
+     * @param _amount    Amount of the ERC20 to withdraw.
     * @param _extraData Optional data forwarded from L2.
     */
    function finalizeERC20Withdrawal(

--- a/packages/contracts-bedrock/contracts/L2/GasPriceOracle.sol
+++ b/packages/contracts-bedrock/contracts/L2/GasPriceOracle.sol
@@ -19,15 +19,17 @@ import { L1Block } from "../L2/L1Block.sol";
 contract GasPriceOracle is Ownable, Semver {
    /**
     * @custom:legacy
+     * @custom:spacer gasPrice
     * @notice Spacer for backwards compatibility.
     */
-    uint256 private spacer0;
+    uint256 private spacer_1_0_32;

    /**
     * @custom:legacy
+     * @custom:spacer l1BaseFee
     * @notice Spacer for backwards compatibility.
     */
-    uint256 private spacer1;
+    uint256 private spacer_2_0_32;

    /**
     * @notice Constant L1 gas overhead per transaction.

--- a/packages/contracts-bedrock/contracts/L2/L2ToL1MessagePasser.sol
+++ b/packages/contracts-bedrock/contracts/L2/L2ToL1MessagePasser.sol
@@ -8,7 +8,7 @@ import { Semver } from "../universal/Semver.sol";

 /**
 * @custom:proxied
- * @custom:predeploy 0x4200000000000000000000000000000000000000
+ * @custom:predeploy 0x4200000000000000000000000000000000000016
 * @title L2ToL1MessagePasser
 * @notice The L2ToL1MessagePasser is a dedicated contract where messages that are being sent from
 *         L2 to L1 can be stored. The storage root of this contract is pulled up to the top level

--- a/packages/contracts-bedrock/contracts/legacy/LegacyMessagePasser.sol
+++ b/packages/contracts-bedrock/contracts/legacy/LegacyMessagePasser.sol
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.15;
+
+import { Semver } from "../universal/Semver.sol";
+
+/**
+ * @custom:legacy
+ * @custom:proxied
+ * @custom:predeploy 0x4200000000000000000000000000000000000000
+ * @title LegacyMessagePasser
+ * @notice The LegacyMessagePasser was the low-level mechanism used to send messages from L2 to L1
+ *         before the Bedrock upgrade. It is now deprecated in favor of the new MessagePasser.
+ */
+contract LegacyMessagePasser is Semver {
+    /**
+     * @notice Mapping of sent message hashes to boolean status.
+     */
+    mapping(bytes32 => bool) public sentMessages;
+
+    /**
+     * @custom:semver 0.0.1
+     */
+    constructor() Semver(0, 0, 1) {}
+
+    /**
+     * @notice Passes a message to L1.
+     *
+     * @param _message Message to pass to L1.
+     */
+    function passMessageToL1(bytes memory _message) external {
+        sentMessages[keccak256(abi.encodePacked(_message, msg.sender))] = true;
+    }
+}
--- a/packages/contracts-bedrock/contracts/libraries/Predeploys.sol
+++ b/packages/contracts-bedrock/contracts/libraries/Predeploys.sol
@@ -9,7 +9,7 @@ library Predeploys {
    /**
     * @notice Address of the L2ToL1MessagePasser predeploy.
     */
-    address internal constant L2_TO_L1_MESSAGE_PASSER = 0x4200000000000000000000000000000000000000;
+    address internal constant L2_TO_L1_MESSAGE_PASSER = 0x4200000000000000000000000000000000000016;

    /**
     * @notice Address of the L2CrossDomainMessenger predeploy.
@@ -38,6 +38,12 @@ library Predeploys {
     */
    address internal constant L1_BLOCK_ATTRIBUTES = 0x4200000000000000000000000000000000000015;

+    /**
+     * @notice Address of the GasPriceOracle predeploy. Includes fee information
+     *         and helpers for computing the L1 portion of the transaction fee.
+     */
+    address internal constant GAS_PRICE_ORACLE = 0x420000000000000000000000000000000000000F;
+
    /**
     * @custom:legacy
     * @notice Address of the L1MessageSender predeploy. Deprecated. Use L2CrossDomainMessenger
@@ -67,8 +73,9 @@ library Predeploys {
    address internal constant L1_BLOCK_NUMBER = 0x4200000000000000000000000000000000000013;

    /**
-     * @notice Address of the GasPriceOracle predeploy. Includes fee information
-     *         and helpers for computing the L1 portion of the transaction fee.
+     * @custom:legacy
+     * @notice Address of the LegacyMessagePasser predeploy. Deprecate. Use the updated
+     *         L2ToL1MessagePasser contract instead.
     */
-    address internal constant GAS_PRICE_ORACLE = 0x420000000000000000000000000000000000000F;
+    address internal constant LEGACY_MESSAGE_PASSER = 0x4200000000000000000000000000000000000000;
 }
--- a/packages/contracts-bedrock/contracts/test/LegacyMessagePasser.t.sol
+++ b/packages/contracts-bedrock/contracts/test/LegacyMessagePasser.t.sol
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.15;
+
+import { CommonTest } from "./CommonTest.t.sol";
+import { LegacyMessagePasser } from "../legacy/LegacyMessagePasser.sol";
+import { Predeploys } from "../libraries/Predeploys.sol";
+
+contract LegacyMessagePasser_Test is CommonTest {
+    LegacyMessagePasser messagePasser;
+
+    function setUp() external {
+        messagePasser = new LegacyMessagePasser();
+    }
+
+    function test_LegacyMessagePasser_passMessageToL1_Succeeds() external {
+        vm.prank(alice);
+        messagePasser.passMessageToL1(hex"ff");
+        assert(messagePasser.sentMessages(keccak256(abi.encodePacked(hex"ff", alice))));
+    }
+}
--- a/packages/contracts-bedrock/contracts/test/OptimismMintableERC20.t.sol
+++ b/packages/contracts-bedrock/contracts/test/OptimismMintableERC20.t.sol
@@ -2,7 +2,7 @@
 pragma solidity 0.8.15;

 import { Bridge_Initializer } from "./CommonTest.t.sol";
-import "../universal/SupportedInterfaces.sol";
+import { ILegacyMintableERC20, IOptimismMintableERC20 } from "../universal/SupportedInterfaces.sol";
 import { IERC165 } from "@openzeppelin/contracts/utils/introspection/IERC165.sol";

 contract OptimismMintableERC20_Test is Bridge_Initializer {
@@ -74,11 +74,11 @@ contract OptimismMintableERC20_Test is Bridge_Initializer {
        assert(L2Token.supportsInterface(iface1));

        bytes4 iface2 = L2Token.l1Token.selector ^ L2Token.mint.selector ^ L2Token.burn.selector;
-        assertEq(iface2, type(IL1Token).interfaceId);
+        assertEq(iface2, type(ILegacyMintableERC20).interfaceId);
        assert(L2Token.supportsInterface(iface2));

-        bytes4 iface3 = L2Token.remoteToken.selector ^ L2Token.mint.selector ^ L2Token.burn.selector;
-        assertEq(iface3, type(IRemoteToken).interfaceId);
+        bytes4 iface3 = L2Token.remoteToken.selector ^ L2Token.bridge.selector ^ L2Token.mint.selector ^ L2Token.burn.selector;
+        assertEq(iface3, type(IOptimismMintableERC20).interfaceId);
        assert(L2Token.supportsInterface(iface3));
    }
 }
--- a/packages/contracts-bedrock/contracts/test/OptimismMintableERC20Factory.t.sol
+++ b/packages/contracts-bedrock/contracts/test/OptimismMintableERC20Factory.t.sol
@@ -32,8 +32,8 @@ contract OptimismMintableTokenFactory_Test is Bridge_Initializer {

        vm.expectEmit(true, true, true, true);
        emit OptimismMintableERC20Created(
-            remote,
            local,
+            remote,
            alice
        );

@@ -57,8 +57,8 @@ contract OptimismMintableTokenFactory_Test is Bridge_Initializer {

        vm.expectEmit(true, true, true, true);
        emit OptimismMintableERC20Created(
-            remote,
            local,
+            remote,
            alice
        );


--- a/packages/contracts-bedrock/contracts/universal/CrossDomainMessenger.sol
+++ b/packages/contracts-bedrock/contracts/universal/CrossDomainMessenger.sol
@@ -24,10 +24,10 @@ import { Encoding } from "../libraries/Encoding.sol";
 contract CrossDomainMessengerLegacySpacer {
    /**
     * @custom:legacy
-     * @custom:spacer address libAddressManager
+     * @custom:spacer libAddressManager
     * @notice Spacer for backwards compatibility.
     */
-    bytes20 private spacer_0_0_20;
+    address private spacer_0_0_20;
 }

 /**
@@ -94,17 +94,17 @@ abstract contract CrossDomainMessenger is

    /**
     * @custom:legacy
-     * @custom:spacer mapping(bytes32=>bool) blockedMessages
+     * @custom:spacer blockedMessages
     * @notice Spacer for backwards compatibility.
     */
-    bytes32 private spacer_201_0_32;
+    mapping(bytes32 => bool) private spacer_201_0_32;

    /**
     * @custom:legacy
-     * @custom:spacer mapping(bytes32=>bool) relayedMessages
+     * @custom:spacer relayedMessages
     * @notice Spacer for backwards compatibility.
     */
-    bytes32 private spacer_202_0_32;
+    mapping(bytes32 => bool) private spacer_202_0_32;

    /**
     * @notice Mapping of message hashes to boolean receipt values. Note that a message will only

--- a/packages/contracts-bedrock/contracts/universal/OptimismMintableERC20.sol
+++ b/packages/contracts-bedrock/contracts/universal/OptimismMintableERC20.sol
@@ -2,7 +2,7 @@
 pragma solidity 0.8.15;

 import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
-import "./SupportedInterfaces.sol";
+import { IERC165, ILegacyMintableERC20, IOptimismMintableERC20 } from "./SupportedInterfaces.sol";

 /**
 * @title OptimismMintableERC20
@@ -12,7 +12,7 @@ import "./SupportedInterfaces.sol";
 *         Designed to be backwards compatible with the older StandardL2ERC20 token which was only
 *         meant for use on L2.
 */
-contract OptimismMintableERC20 is ERC20 {
+contract OptimismMintableERC20 is IOptimismMintableERC20, ILegacyMintableERC20, ERC20 {
    /**
     * @notice Address of the corresponding version of this token on the remote chain.
     */
@@ -69,7 +69,12 @@ contract OptimismMintableERC20 is ERC20 {
     * @param _to     Address to mint tokens to.
     * @param _amount Amount of tokens to mint.
     */
-    function mint(address _to, uint256 _amount) external virtual onlyBridge {
+    function mint(address _to, uint256 _amount)
+        external
+        virtual
+        override(IOptimismMintableERC20, ILegacyMintableERC20)
+        onlyBridge
+    {
        _mint(_to, _amount);
        emit Mint(_to, _amount);
    }
@@ -80,7 +85,12 @@ contract OptimismMintableERC20 is ERC20 {
     * @param _from   Address to burn tokens from.
     * @param _amount Amount of tokens to burn.
     */
-    function burn(address _from, uint256 _amount) external virtual onlyBridge {
+    function burn(address _from, uint256 _amount)
+        external
+        virtual
+        override(IOptimismMintableERC20, ILegacyMintableERC20)
+        onlyBridge
+    {
        _burn(_from, _amount);
        emit Burn(_from, _amount);
    }
@@ -94,8 +104,10 @@ contract OptimismMintableERC20 is ERC20 {
     */
    function supportsInterface(bytes4 _interfaceId) external pure returns (bool) {
        bytes4 iface1 = type(IERC165).interfaceId;
-        bytes4 iface2 = type(IL1Token).interfaceId;
-        bytes4 iface3 = type(IRemoteToken).interfaceId;
+        // Interface corresponding to the legacy L2StandardERC20.
+        bytes4 iface2 = type(ILegacyMintableERC20).interfaceId;
+        // Interface corresponding to the updated OptimismMintableERC20 (this contract).
+        bytes4 iface3 = type(IOptimismMintableERC20).interfaceId;
        return _interfaceId == iface1 || _interfaceId == iface2 || _interfaceId == iface3;
    }


--- a/packages/contracts-bedrock/contracts/universal/OptimismMintableERC20Factory.sol
+++ b/packages/contracts-bedrock/contracts/universal/OptimismMintableERC20Factory.sol
@@ -87,17 +87,17 @@ contract OptimismMintableERC20Factory {
            "OptimismMintableERC20Factory: must provide remote token address"
        );

-        OptimismMintableERC20 localToken = new OptimismMintableERC20(
-            bridge,
-            _remoteToken,
-            _name,
-            _symbol
+        address localToken = address(
+            new OptimismMintableERC20(bridge, _remoteToken, _name, _symbol)
        );

        // Emit the old event too for legacy support.
-        emit StandardL2TokenCreated(_remoteToken, address(localToken));
-        emit OptimismMintableERC20Created(_remoteToken, address(localToken), msg.sender);
+        emit StandardL2TokenCreated(_remoteToken, localToken);

-        return address(localToken);
+        // Emit the updated event. The arguments here differ from the legacy event, but
+        // are consistent with the ordering used in StandardBridge events.
+        emit OptimismMintableERC20Created(localToken, _remoteToken, msg.sender);
+
+        return localToken;
    }
 }
--- a/packages/contracts-bedrock/contracts/universal/StandardBridge.sol
+++ b/packages/contracts-bedrock/contracts/universal/StandardBridge.sol
@@ -6,7 +6,7 @@ import { ERC165Checker } from "@openzeppelin/contracts/utils/introspection/ERC16
 import { Address } from "@openzeppelin/contracts/utils/Address.sol";
 import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import { SafeCall } from "../libraries/SafeCall.sol";
-import { IRemoteToken, IL1Token } from "./SupportedInterfaces.sol";
+import { IOptimismMintableERC20, ILegacyMintableERC20 } from "./SupportedInterfaces.sol";
 import { CrossDomainMessenger } from "./CrossDomainMessenger.sol";
 import { OptimismMintableERC20 } from "./OptimismMintableERC20.sol";

@@ -35,17 +35,17 @@ abstract contract StandardBridge {

    /**
     * @custom:legacy
-     * @custom:spacer address messenger
+     * @custom:spacer messenger
     * @notice Spacer for backwards compatibility.
     */
-    bytes32 private spacer_0_0_32;
+    address private spacer_0_0_20;

    /**
     * @custom:legacy
-     * @custom:spacer address l2TokenBridge
+     * @custom:spacer l2TokenBridge
     * @notice Spacer for backwards compatibility.
     */
-    bytes32 private spacer_1_0_32;
+    address private spacer_1_0_20;

    /**
     * @notice Mapping that stores deposits for a given pair of local and remote tokens.
@@ -96,7 +96,7 @@ abstract contract StandardBridge {
     * @param remoteToken Address of the ERC20 on the remote chain.
     * @param from        Address of the sender.
     * @param to          Address of the receiver.
-     * @param amount      Amount of ETH sent.
+     * @param amount      Amount of the ERC20 sent.
     * @param extraData   Extra data sent with the transaction.
     */
    event ERC20BridgeInitiated(
@@ -115,7 +115,7 @@ abstract contract StandardBridge {
     * @param remoteToken Address of the ERC20 on the remote chain.
     * @param from        Address of the sender.
     * @param to          Address of the receiver.
-     * @param amount      Amount of ETH sent.
+     * @param amount      Amount of the ERC20 sent.
     * @param extraData   Extra data sent with the transaction.
     */
    event ERC20BridgeFinalized(
@@ -134,7 +134,7 @@ abstract contract StandardBridge {
     * @param remoteToken Address of the ERC20 on the remote chain.
     * @param from        Address of the sender.
     * @param to          Address of the receiver.
-     * @param amount      Amount of ETH sent.
+     * @param amount      Amount of the ERC20 sent.
     * @param extraData   Extra data sent with the transaction.
     */
    event ERC20BridgeFailed(
@@ -325,12 +325,11 @@ abstract contract StandardBridge {
     * @notice Finalizes an ERC20 bridge on this chain. Can only be triggered by the other
     *         StandardBridge contract on the remote chain.
     *
-     *
     * @param _localToken  Address of the ERC20 on this chain.
     * @param _remoteToken Address of the corresponding token on the remote chain.
     * @param _from        Address of the sender.
     * @param _to          Address of the receiver.
-     * @param _amount      Amount of ETH being bridged.
+     * @param _amount      Amount of the ERC20 being bridged.
     * @param _extraData   Extra data to be sent with the transaction. Note that the recipient will
     *                     not be triggered with this data, but it will be emitted and can be used
     *                     to identify the transaction.
@@ -376,7 +375,7 @@ abstract contract StandardBridge {
     * @param _localToken  Address of the ERC20 on this chain.
     * @param _remoteToken Address of the corresponding token on the remote chain.
     * @param _to          Address of the receiver.
-     * @param _amount      Amount of ETH being bridged.
+     * @param _amount      Amount of the ERC20 being bridged.
     */
    function completeOutboundTransfer(
        address _localToken,
@@ -533,7 +532,9 @@ abstract contract StandardBridge {
     * @return True if the token is an OptimismMintableERC20.
     */
    function _isOptimismMintableERC20(address _token) internal view returns (bool) {
-        return ERC165Checker.supportsInterface(_token, type(IL1Token).interfaceId);
+        return
+            ERC165Checker.supportsInterface(_token, type(ILegacyMintableERC20).interfaceId) ||
+            ERC165Checker.supportsInterface(_token, type(IOptimismMintableERC20).interfaceId);
    }

    /**

--- a/packages/contracts-bedrock/contracts/universal/SupportedInterfaces.sol
+++ b/packages/contracts-bedrock/contracts/universal/SupportedInterfaces.sol
@@ -4,18 +4,32 @@ pragma solidity ^0.8.0;
 // Import this here to make it available just by importing this file
 import { IERC165 } from "@openzeppelin/contracts/utils/introspection/IERC165.sol";

-interface IRemoteToken {
+/**
+ * @title IOptimismMintableERC20
+ * @notice This interface is available on the OptimismMintableERC20 contract. We declare it as a
+ *         separate interface so that it can be used in custom implementations of
+ *         OptimismMintableERC20.
+ */
+interface IOptimismMintableERC20 {
+    function remoteToken() external returns (address);
+
+    function bridge() external returns (address);
+
    function mint(address _to, uint256 _amount) external;

    function burn(address _from, uint256 _amount) external;
-
-    function remoteToken() external;
 }

-interface IL1Token {
+/**
+ * @custom:legacy
+ * @title ILegacyMintableERC20
+ * @notice This interface was available on the legacy L2StandardERC20 contract. It remains available
+ *         on the OptimismMintableERC20 contract for backwards compatibility.
+ */
+interface ILegacyMintableERC20 {
+    function l1Token() external returns (address);
+
    function mint(address _to, uint256 _amount) external;

    function burn(address _from, uint256 _amount) external;
-
-    function l1Token() external;
 }
--- a/packages/contracts-bedrock/src/constants.ts
+++ b/packages/contracts-bedrock/src/constants.ts
@@ -7,7 +7,7 @@
 * in the future. See https://github.com/ethereum-optimism/optimism/pull/549 for more info.
 */
 export const predeploys = {
-  L2ToL1MessagePasser: '0x4200000000000000000000000000000000000000',
+  L2ToL1MessagePasser: '0x4200000000000000000000000000000000000016',
  DeployerWhitelist: '0x4200000000000000000000000000000000000002',
  L2CrossDomainMessenger: '0x4200000000000000000000000000000000000007',
  GasPriceOracle: '0x420000000000000000000000000000000000000F',
@@ -19,6 +19,7 @@ export const predeploys = {
  LegacyERC20ETH: '0xDeadDeAddeAddEAddeadDEaDDEAdDeaDDeAD0000',
  WETH9: '0x4200000000000000000000000000000000000006',
  GovernanceToken: '0x4200000000000000000000000000000000000042',
+  LegacyMessagePasser: '0x4200000000000000000000000000000000000000',
 }

 export const futurePredeploys = {

--- a/packages/contracts-periphery/contracts/L1/L1ERC721Bridge.sol
+++ b/packages/contracts-periphery/contracts/L1/L1ERC721Bridge.sol
--- a/packages/contracts-periphery/contracts/L2/L2ERC721Bridge.sol
+++ b/packages/contracts-periphery/contracts/L2/L2ERC721Bridge.sol
--- a/packages/contracts-periphery/contracts/universal/op-erc721/ERC721Bridge.sol
+++ b/packages/contracts-periphery/contracts/universal/op-erc721/ERC721Bridge.sol
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.15;
+
+import {
+    CrossDomainMessenger
+} from "@eth-optimism/contracts-bedrock/contracts/universal/CrossDomainMessenger.sol";
+import { Address } from "@openzeppelin/contracts/utils/Address.sol";
+
+/**
+ * @title ERC721Bridge
+ * @notice ERC721Bridge is a base contract for the L1 and L2 ERC721 bridges.
+ */
+abstract contract ERC721Bridge {
+    /**
+     * @notice Emitted when an ERC721 bridge to the other network is initiated.
+     *
+     * @param localToken  Address of the token on this domain.
+     * @param remoteToken Address of the token on the remote domain.
+     * @param from        Address that initiated bridging action.
+     * @param to          Address to receive the token.
+     * @param tokenId     ID of the specific token deposited.
+     * @param extraData   Extra data for use on the client-side.
+     */
+    event ERC721BridgeInitiated(
+        address indexed localToken,
+        address indexed remoteToken,
+        address indexed from,
+        address to,
+        uint256 tokenId,
+        bytes extraData
+    );
+
+    /**
+     * @notice Emitted when an NFT is refunded to the owner after an ERC721 bridge from the other
+     *         chain fails.
+     *
+     * @param localToken  Address of the token on this domain.
+     * @param remoteToken Address of the token on the remote domain.
+     * @param to          Address to receive the refunded token.
+     * @param tokenId     ID of the specific token being refunded.
+     * @param extraData   Extra data for use on the client-side.
+     */
+    event ERC721Refunded(
+        address indexed localToken,
+        address indexed remoteToken,
+        address indexed to,
+        uint256 tokenId,
+        bytes extraData
+    );
+
+    /**
+     * @notice Emitted when an ERC721 bridge from the other network is finalized.
+     *
+     * @param localToken  Address of the token on this domain.
+     * @param remoteToken Address of the token on the remote domain.
+     * @param from        Address that initiated bridging action.
+     * @param to          Address to receive the token.
+     * @param tokenId     ID of the specific token deposited.
+     * @param extraData   Extra data for use on the client-side.
+     */
+    event ERC721BridgeFinalized(
+        address indexed localToken,
+        address indexed remoteToken,
+        address indexed from,
+        address to,
+        uint256 tokenId,
+        bytes extraData
+    );
+
+    /**
+     * @notice Emitted when an ERC721 bridge from the other network fails.
+     *
+     * @param localToken  Address of the token on this domain.
+     * @param remoteToken Address of the token on the remote domain.
+     * @param from        Address that initiated bridging action.
+     * @param to          Address to receive the token.
+     * @param tokenId     ID of the specific token deposited.
+     * @param extraData   Extra data for use on the client-side.
+     */
+    event ERC721BridgeFailed(
+        address indexed localToken,
+        address indexed remoteToken,
+        address indexed from,
+        address to,
+        uint256 tokenId,
+        bytes extraData
+    );
+
+    /**
+     * @notice Messenger contract on this domain.
+     */
+    CrossDomainMessenger public immutable messenger;
+
+    /**
+     * @notice Address of the bridge on the other network.
+     */
+    address public immutable otherBridge;
+
+    /**
+     * @notice Reserve extra slots (to a total of 50) in the storage layout for future upgrades.
+     */
+    uint256[49] private __gap;
+
+    /**
+     * @notice Ensures that the caller is a cross-chain message from the other bridge.
+     */
+    modifier onlyOtherBridge() {
+        require(
+            msg.sender == address(messenger) && messenger.xDomainMessageSender() == otherBridge,
+            "ERC721Bridge: function can only be called from the other bridge"
+        );
+        _;
+    }
+
+    /**
+     * @notice Ensures that the caller is this contract.
+     */
+    modifier onlySelf() {
+        require(msg.sender == address(this), "ERC721Bridge: function can only be called by self");
+        _;
+    }
+
+    /**
+     * @param _messenger   Address of the CrossDomainMessenger on this network.
+     * @param _otherBridge Address of the ERC721 bridge on the other network.
+     */
+    constructor(address _messenger, address _otherBridge) {
+        messenger = CrossDomainMessenger(_messenger);
+        otherBridge = _otherBridge;
+    }
+
+    /**
+     * @notice Initiates a bridge of an NFT to the caller's account on the other chain. Note that
+     *         this function can only be called by EOAs. Smart contract wallets should use the
+     *         `bridgeERC721To` function after ensuring that the recipient address on the remote
+     *         chain exists. Also note that the current owner of the token on this chain must
+     *         approve this contract to operate the NFT before it can be bridged.
+     *         **WARNING**: Do not bridge an ERC721 that was originally deployed on Optimism. This
+     *         bridge only supports ERC721s originally deployed on Ethereum. Users will need to
+     *         wait for the one-week challenge period to elapse before their Optimism-native NFT
+     *         can be refunded on L2.
+     *
+     * @param _localToken  Address of the ERC721 on this domain.
+     * @param _remoteToken Address of the ERC721 on the remote domain.
+     * @param _tokenId     Token ID to bridge.
+     * @param _minGasLimit Minimum gas limit for the bridge message on the other domain.
+     * @param _extraData   Optional data to forward to the other chain. Data supplied here will not
+     *                     be used to execute any code on the other chain and is only emitted as
+     *                     extra data for the convenience of off-chain tooling.
+     */
+    function bridgeERC721(
+        address _localToken,
+        address _remoteToken,
+        uint256 _tokenId,
+        uint32 _minGasLimit,
+        bytes calldata _extraData
+    ) external {
+        // Modifier requiring sender to be EOA. This prevents against a user error that would occur
+        // if the sender is a smart contract wallet that has a different address on the remote chain
+        // (or doesn't have an address on the remote chain at all). The user would fail to receive
+        // the NFT if they use this function because it sends the NFT to the same address as the
+        // caller. This check could be bypassed by a malicious contract via initcode, but it takes
+        // care of the user error we want to avoid.
+        require(!Address.isContract(msg.sender), "ERC721Bridge: account is not externally owned");
+
+        _initiateBridgeERC721(
+            _localToken,
+            _remoteToken,
+            msg.sender,
+            msg.sender,
+            _tokenId,
+            _minGasLimit,
+            _extraData
+        );
+    }
+
+    /**
+     * @notice Initiates a bridge of an NFT to some recipient's account on the other chain. Note
+     *         that the current owner of the token on this chain must approve this contract to
+     *         operate the NFT before it can be bridged.
+     *         **WARNING**: Do not bridge an ERC721 that was originally deployed on Optimism. This
+     *         bridge only supports ERC721s originally deployed on Ethereum. Users will need to
+     *         wait for the one-week challenge period to elapse before their Optimism-native NFT
+     *         can be refunded on L2.
+     *
+     * @param _localToken  Address of the ERC721 on this domain.
+     * @param _remoteToken Address of the ERC721 on the remote domain.
+     * @param _to          Address to receive the token on the other domain.
+     * @param _tokenId     Token ID to bridge.
+     * @param _minGasLimit Minimum gas limit for the bridge message on the other domain.
+     * @param _extraData   Optional data to forward to the other chain. Data supplied here will not
+     *                     be used to execute any code on the other chain and is only emitted as
+     *                     extra data for the convenience of off-chain tooling.
+     */
+    function bridgeERC721To(
+        address _localToken,
+        address _remoteToken,
+        address _to,
+        uint256 _tokenId,
+        uint32 _minGasLimit,
+        bytes calldata _extraData
+    ) external {
+        require(_to != address(0), "ERC721Bridge: nft recipient cannot be address(0)");
+
+        _initiateBridgeERC721(
+            _localToken,
+            _remoteToken,
+            msg.sender,
+            _to,
+            _tokenId,
+            _minGasLimit,
+            _extraData
+        );
+    }
+
+    /**
+     * @notice Internal function for initiating a token bridge to the other domain.
+     *
+     * @param _localToken  Address of the ERC721 on this domain.
+     * @param _remoteToken Address of the ERC721 on the remote domain.
+     * @param _from        Address of the sender on this domain.
+     * @param _to          Address to receive the token on the other domain.
+     * @param _tokenId     Token ID to bridge.
+     * @param _minGasLimit Minimum gas limit for the bridge message on the other domain.
+     * @param _extraData   Optional data to forward to the other domain. Data supplied here will
+     *                     not be used to execute any code on the other domain and is only emitted
+     *                     as extra data for the convenience of off-chain tooling.
+     */
+    function _initiateBridgeERC721(
+        address _localToken,
+        address _remoteToken,
+        address _from,
+        address _to,
+        uint256 _tokenId,
+        uint32 _minGasLimit,
+        bytes calldata _extraData
+    ) internal virtual;
+}
--- a/packages/contracts-periphery/contracts/universal/op-erc721/IOptimismMintableERC721.sol
+++ b/packages/contracts-periphery/contracts/universal/op-erc721/IOptimismMintableERC721.sol
@@ -43,12 +43,13 @@ interface IOptimismMintableERC721 is IERC721Enumerable {
    function bridge() external view returns (address);

    /**
-     * @notice Mints some token ID for a user.
+     * @notice Mints some token ID for a user, checking first that contract recipients
+     *         are aware of the ERC721 protocol to prevent tokens from being forever locked.
     *
     * @param _to      Address of the user to mint the token for.
     * @param _tokenId Token ID to mint.
     */
-    function mint(address _to, uint256 _tokenId) external;
+    function safeMint(address _to, uint256 _tokenId) external;

    /**
     * @notice Burns a token ID from a user.

--- a/packages/contracts-periphery/contracts/universal/op-erc721/OptimismMintableERC721.sol
+++ b/packages/contracts-periphery/contracts/universal/op-erc721/OptimismMintableERC721.sol
--- a/packages/contracts-periphery/contracts/universal/op-erc721/OptimismMintableERC721Factory.sol
+++ b/packages/contracts-periphery/contracts/universal/op-erc721/OptimismMintableERC721Factory.sol
--- a/packages/contracts-periphery/test/contracts/L1/L1ERC721Bridge.spec.ts
+++ b/packages/contracts-periphery/test/contracts/L1/L1ERC721Bridge.spec.ts
--- a/packages/contracts-periphery/test/contracts/L2/L2ERC721Bridge.spec.ts
+++ b/packages/contracts-periphery/test/contracts/L2/L2ERC721Bridge.spec.ts
--- a/packages/contracts-periphery/test/contracts/universal/OptimismMintableERC721.spec.ts
+++ b/packages/contracts-periphery/test/contracts/universal/OptimismMintableERC721.spec.ts
--- a/packages/contracts-periphery/test/contracts/universal/OptimismMintableERC721Factory.spec.ts
+++ b/packages/contracts-periphery/test/contracts/universal/OptimismMintableERC721Factory.spec.ts
@@ -22,6 +22,7 @@ describe('OptimismMintableERC721Factory', () => {
  let baseURI: string
  const remoteChainId = 100

+  let Factory__OptimismMintableERC721Factory: ContractFactory
  beforeEach(async () => {
    ;[signer] = await ethers.getSigners()

@@ -31,9 +32,14 @@ describe('OptimismMintableERC721Factory', () => {
    )
    L1ERC721 = await Factory__L1ERC721.deploy('L1ERC721', 'ERC')

-    OptimismMintableERC721Factory = await (
-      await ethers.getContractFactory('OptimismMintableERC721Factory')
-    ).deploy(DUMMY_L2_BRIDGE_ADDRESS, remoteChainId)
+    Factory__OptimismMintableERC721Factory = await ethers.getContractFactory(
+      'OptimismMintableERC721Factory'
+    )
+    OptimismMintableERC721Factory =
+      await Factory__OptimismMintableERC721Factory.deploy(
+        DUMMY_L2_BRIDGE_ADDRESS,
+        remoteChainId
+      )

    baseURI = ''.concat(
      'ethereum:',
@@ -44,6 +50,25 @@ describe('OptimismMintableERC721Factory', () => {
    )
  })

+  it('should revert if bridge is initialized as address(0)', async () => {
+    await expect(
+      Factory__OptimismMintableERC721Factory.deploy(
+        ethers.constants.AddressZero,
+        remoteChainId
+      )
+    ).to.be.revertedWith(
+      'OptimismMintableERC721Factory: bridge cannot be address(0)'
+    )
+  })
+
+  it('should revert if remote chain id is initialized as zero', async () => {
+    await expect(
+      Factory__OptimismMintableERC721Factory.deploy(DUMMY_L2_BRIDGE_ADDRESS, 0)
+    ).to.be.revertedWith(
+      'OptimismMintableERC721Factory: remote chain id cannot be zero'
+    )
+  })
+
  it('should be deployed with the correct constructor argument', async () => {
    expect(await OptimismMintableERC721Factory.bridge()).to.equal(
      DUMMY_L2_BRIDGE_ADDRESS

--- a/packages/data-transport-layer/src/services/l1-ingestion/service.ts
+++ b/packages/data-transport-layer/src/services/l1-ingestion/service.ts
--- a/packages/fault-detector/src/service.ts
+++ b/packages/fault-detector/src/service.ts
--- a/packages/sdk/src/cross-chain-messenger.ts
+++ b/packages/sdk/src/cross-chain-messenger.ts
@@ -1220,7 +1220,7 @@ export class CrossChainMessenger {
    // compatible without WithdrawalInitiatedExtension1
    const logs: Partial<{ number: WithdrawalEntry }> = {}
    for (const [i, log] of Object.entries(receipt.logs)) {
-      if (log.address === predeploys.OVM_L2ToL1MessagePasser) {
+      if (log.address === this.contracts.l2.BedrockMessagePasser.address) {
        const decoded =
          this.contracts.l2.L2ToL1MessagePasser.interface.parseLog(log)
        // Find the withdrawal initiated events
@@ -1273,7 +1273,7 @@ export class CrossChainMessenger {
      [withdrawalHash, ethers.constants.HashZero]
    )
    const isMessageSent =
-      await this.contracts.l2.L2ToL1MessagePasser.sentMessages(withdrawalHash)
+      await this.contracts.l2.BedrockMessagePasser.sentMessages(withdrawalHash)

    if (!isMessageSent) {
      throw new Error(`Withdrawal not initiated on L2`)
@@ -1284,7 +1284,7 @@ export class CrossChainMessenger {
    const stateTrieProof = await makeStateTrieProof(
      this.l2Provider as ethers.providers.JsonRpcProvider,
      output.l2BlockNumber,
-      this.contracts.l2.OVM_L2ToL1MessagePasser.address,
+      this.contracts.l2.BedrockMessagePasser.address,
      messageSlot
    )


--- a/packages/sdk/src/interfaces/types.ts
+++ b/packages/sdk/src/interfaces/types.ts
@@ -61,6 +61,7 @@ export interface OEL2Contracts {
  OVM_GasPriceOracle: Contract
  OVM_SequencerFeeVault: Contract
  WETH: Contract
+  BedrockMessagePasser: Contract
 }

 /**

--- a/packages/sdk/src/utils/chain-constants.ts
+++ b/packages/sdk/src/utils/chain-constants.ts
@@ -2,6 +2,7 @@ import {
  predeploys,
  getDeployedContractDefinition,
 } from '@eth-optimism/contracts'
+import { predeploys as bedrockPredeploys } from '@eth-optimism/contracts-bedrock'

 import {
  L1ChainID,
@@ -49,6 +50,7 @@ export const DEFAULT_L2_CONTRACT_ADDRESSES: OEL2ContractsLike = {
  OVM_GasPriceOracle: predeploys.OVM_GasPriceOracle,
  OVM_SequencerFeeVault: predeploys.OVM_SequencerFeeVault,
  WETH: predeploys.WETH9,
+  BedrockMessagePasser: bedrockPredeploys.L2ToL1MessagePasser,
 }

 /**

--- a/packages/sdk/src/utils/contracts.ts
+++ b/packages/sdk/src/utils/contracts.ts
@@ -29,6 +29,7 @@ const NAME_REMAPPING = {
  AddressManager: 'Lib_AddressManager' as const,
  OVM_L1BlockNumber: 'iOVM_L1BlockNumber' as const,
  WETH: 'WETH9' as const,
+  BedrockMessagePasser: 'L2ToL1MessagePasser' as const,
 }

 /**

--- a/packages/sdk/tasks/deposit-erc20.ts
+++ b/packages/sdk/tasks/deposit-erc20.ts
--- a/specs/bridges.md
+++ b/specs/bridges.md
--- a/specs/predeploys.md
+++ b/specs/predeploys.md
--- a/specs/withdrawals.md
+++ b/specs/withdrawals.md
@@ -73,7 +73,7 @@ An L2 account sends a withdrawal message (and possibly also ETH) to the `L2ToL1M
 [message-passer-contract]: #the-l2tol1messagepasser-contract

 A withdrawal is initiated by calling the L2ToL1MessagePasser contract's `initiateWithdrawal` function.
-The L2ToL1MessagePasser is a simple predeploy contract at `0x4200000000000000000000000000000000000000`
+The L2ToL1MessagePasser is a simple predeploy contract at `0x4200000000000000000000000000000000000016`
 which stores messages to be withdrawn.

 ```js