Merge remote-tracking branch 'origin/develop' into rv/feature-ci

ddf563de · Juan C · 64a3a4a4 · 5b0b8cf5 · ddf563de · ddf563de
Commit ddf563de authored Nov 28, 2023 by Juan C
434 changed files
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
--- a/.foundryrc
+++ b/.foundryrc
-d85718785859dc0b5a095d2302d1a20ec06ab77a
+3e962e2efe17396886fcb1fd141ccf4204cd3a21
--- a/.prettierrc.js
+++ b/.prettierrc.js
 module.exports = {
  $schema: 'http://json.schemastore.org/prettierrc',
-  plugins: ['prettier-plugin-solidity'],
+  plugins: [],
  trailingComma: 'es5',
  tabWidth: 2,
  semi: false,
  singleQuote: true,
  arrowParens: 'always',
-  overrides: [
-    {
-      files: '*.sol',
-      options: {
-        // These options are native to Prettier.
-        printWidth: 100,
-        tabWidth: 4,
-        useTabs: false,
-        singleQuote: false,
-        bracketSpacing: true,
-        // These options are specific to the Solidity Plugin
-        explicitTypes: 'always',
-        compiler: '>=0.8.15',
-      },
-    },
-  ],
+  overrides: [],
 }
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -30,6 +30,8 @@ We recommend using the [Conventional Commits](https://www.conventionalcommits.or

 Unless your PR is ready for immediate review and merging, please mark it as 'draft' (or simply do not open a PR yet).

+Once ready for review, make sure to include a thorough PR description to help reviewers. You can read more about the guidelines for opening PRs in the [PR Guidelines](./handbook/pr-guidelines.md) file.
+
 **Bonus:** Add comments to the diff under the "Files Changed" tab on the PR page to clarify any sections where you think we might have questions about the approach taken.

 ### Response time:

--- a/Makefile
+++ b/Makefile
@@ -39,12 +39,17 @@ golang-docker:
 			op-node op-batcher op-proposer op-challenger
 .PHONY: golang-docker

+contracts-bedrock-docker:
+	IMAGE_TAGS=$$(git rev-parse HEAD),latest \
+	docker buildx bake \
+			--progress plain \
+			--load \
+			-f docker-bake.hcl \
+		  contracts-bedrock
+.PHONY: contracts-bedrock-docker
+
 submodules:
-	# CI will checkout submodules on its own (and fails on these commands)
-	if [ -z "$$GITHUB_ENV" ]; then \
-		git submodule init; \
-		git submodule update --recursive; \
-	fi
+	git submodule update --init --recursive
 .PHONY: submodules

 op-bindings:

--- a/cannon/cmd/json.go
+++ b/cannon/cmd/json.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"path"

 	"github.com/ethereum-optimism/optimism/op-service/ioutil"
 )
@@ -35,18 +34,16 @@ func writeJSON[X any](outputPath string, value X) error {
 	var out io.Writer
 	finish := func() error { return nil }
 	if outputPath != "-" {
-		// Write to a tmp file but reserve the file extension if present
-		tmpPath := outputPath + "-tmp" + path.Ext(outputPath)
-		f, err := ioutil.OpenCompressed(tmpPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0755)
+		f, err := ioutil.NewAtomicWriterCompressed(outputPath, 0755)
 		if err != nil {
 			return fmt.Errorf("failed to open output file: %w", err)
 		}
+		// Ensure we close the stream even if failures occur.
 		defer f.Close()
 		out = f
-		finish = func() error {
-			// Rename the file into place as atomically as the OS will allow
-			return os.Rename(tmpPath, outputPath)
-		}
+		// Closing the file causes it to be renamed to the final destination
+		// so make sure we handle any errors it returns
+		finish = f.Close
 	} else {
 		out = os.Stdout
 	}

--- a/cannon/mipsevm/evm.go
+++ b/cannon/mipsevm/evm.go
@@ -2,10 +2,8 @@ package mipsevm

 import (
 	"encoding/binary"
-	"encoding/json"
 	"fmt"
 	"math/big"
-	"os"

 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
@@ -22,27 +20,6 @@ import (
 	"github.com/ethereum-optimism/optimism/op-chain-ops/srcmap"
 )

-var (
-	StepBytes4                      []byte
-	LoadKeccak256PreimagePartBytes4 []byte
-	LoadLocalDataBytes4             []byte
-)
-
-func init() {
-	mipsAbi, err := bindings.MIPSMetaData.GetAbi()
-	if err != nil {
-		panic(fmt.Errorf("failed to load MIPS ABI: %w", err))
-	}
-	StepBytes4 = mipsAbi.Methods["step"].ID[:4]
-
-	preimageAbi, err := bindings.PreimageOracleMetaData.GetAbi()
-	if err != nil {
-		panic(fmt.Errorf("failed to load pre-image oracle ABI: %w", err))
-	}
-	LoadKeccak256PreimagePartBytes4 = preimageAbi.Methods["loadKeccak256PreimagePart"].ID[:4]
-	LoadLocalDataBytes4 = preimageAbi.Methods["loadLocalData"].ID[:4]
-}
-
 // LoadContracts loads the Cannon contracts, from op-bindings package
 func LoadContracts() (*Contracts, error) {
 	var mips, oracle Contract
@@ -56,34 +33,6 @@ func LoadContracts() (*Contracts, error) {
 	}, nil
 }

-// LoadContractsFromFiles loads the Cannon contracts, from local filesystem
-func LoadContractsFromFiles() (*Contracts, error) {
-	mips, err := LoadContract("MIPS")
-	if err != nil {
-		return nil, err
-	}
-	oracle, err := LoadContract("PreimageOracle")
-	if err != nil {
-		return nil, err
-	}
-	return &Contracts{
-		MIPS:   mips,
-		Oracle: oracle,
-	}, nil
-}
-
-func LoadContract(name string) (*Contract, error) {
-	dat, err := os.ReadFile(fmt.Sprintf("../../packages/contracts-bedrock/forge-artifacts/%s.sol/%s.json", name, name))
-	if err != nil {
-		return nil, fmt.Errorf("failed to read contract JSON definition of %q: %w", name, err)
-	}
-	var out Contract
-	if err := json.Unmarshal(dat, &out); err != nil {
-		return nil, fmt.Errorf("failed to parse contract JSON definition of %q: %w", name, err)
-	}
-	return &out, nil
-}
-
 type Contract struct {
 	DeployedBytecode struct {
 		Object    hexutil.Bytes `json:"object"`

--- a/cannon/mipsevm/evm_test.go
+++ b/cannon/mipsevm/evm_test.go
@@ -3,6 +3,8 @@ package mipsevm
 import (
 	"bytes"
 	"debug/elf"
+	"errors"
+	"fmt"
 	"io"
 	"math/big"
 	"os"
@@ -11,6 +13,8 @@ import (
 	"testing"
 	"time"

+	"github.com/ethereum-optimism/optimism/op-bindings/bindings"
+	preimage "github.com/ethereum-optimism/optimism/op-preimage"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/core/state"
@@ -76,13 +80,13 @@ func (m *MIPSEVM) Step(t *testing.T, stepWitness *StepWitness) []byte {

 	if stepWitness.HasPreimage() {
 		t.Logf("reading preimage key %x at offset %d", stepWitness.PreimageKey, stepWitness.PreimageOffset)
-		poInput, err := stepWitness.EncodePreimageOracleInput(0)
+		poInput, err := encodePreimageOracleInput(t, stepWitness, LocalContext{})
 		require.NoError(t, err, "encode preimage oracle input")
 		_, leftOverGas, err := m.env.Call(vm.AccountRef(sender), m.addrs.Oracle, poInput, startingGas, big.NewInt(0))
 		require.NoErrorf(t, err, "evm should not fail, took %d gas", startingGas-leftOverGas)
 	}

-	input := stepWitness.EncodeStepInput(0)
+	input := encodeStepInput(t, stepWitness, LocalContext{})
 	ret, leftOverGas, err := m.env.Call(vm.AccountRef(sender), m.addrs.MIPS, input, startingGas, big.NewInt(0))
 	require.NoError(t, err, "evm should not fail")
 	require.Len(t, ret, 32, "expecting 32-byte state hash")
@@ -101,6 +105,53 @@ func (m *MIPSEVM) Step(t *testing.T, stepWitness *StepWitness) []byte {
 	return evmPost
 }

+func encodeStepInput(t *testing.T, wit *StepWitness, localContext LocalContext) []byte {
+	mipsAbi, err := bindings.MIPSMetaData.GetAbi()
+	require.NoError(t, err)
+
+	input, err := mipsAbi.Pack("step", wit.State, wit.MemProof, localContext)
+	require.NoError(t, err)
+	return input
+}
+
+func encodePreimageOracleInput(t *testing.T, wit *StepWitness, localContext LocalContext) ([]byte, error) {
+	if wit.PreimageKey == ([32]byte{}) {
+		return nil, errors.New("cannot encode pre-image oracle input, witness has no pre-image to proof")
+	}
+
+	preimageAbi, err := bindings.PreimageOracleMetaData.GetAbi()
+	require.NoError(t, err, "failed to load pre-image oracle ABI")
+
+	switch preimage.KeyType(wit.PreimageKey[0]) {
+	case preimage.LocalKeyType:
+		if len(wit.PreimageValue) > 32+8 {
+			return nil, fmt.Errorf("local pre-image exceeds maximum size of 32 bytes with key 0x%x", wit.PreimageKey)
+		}
+		preimagePart := wit.PreimageValue[8:]
+		var tmp [32]byte
+		copy(tmp[:], preimagePart)
+		input, err := preimageAbi.Pack("loadLocalData",
+			new(big.Int).SetBytes(wit.PreimageKey[1:]),
+			localContext,
+			tmp,
+			new(big.Int).SetUint64(uint64(len(preimagePart))),
+			new(big.Int).SetUint64(uint64(wit.PreimageOffset)),
+		)
+		require.NoError(t, err)
+		return input, nil
+	case preimage.Keccak256KeyType:
+		input, err := preimageAbi.Pack(
+			"loadKeccak256PreimagePart",
+			new(big.Int).SetUint64(uint64(wit.PreimageOffset)),
+			wit.PreimageValue[8:])
+		require.NoError(t, err)
+		return input, nil
+	default:
+		return nil, fmt.Errorf("unsupported pre-image type %d, cannot prepare preimage with key %x offset %d for oracle",
+			wit.PreimageKey[0], wit.PreimageKey, wit.PreimageOffset)
+	}
+}
+
 func TestEVM(t *testing.T) {
 	testFiles, err := os.ReadDir("open_mips_tests/test/bin")
 	require.NoError(t, err)
@@ -241,7 +292,7 @@ func TestEVMFault(t *testing.T) {
 				State:    initialState.EncodeWitness(),
 				MemProof: insnProof[:],
 			}
-			input := stepWitness.EncodeStepInput(0)
+			input := encodeStepInput(t, stepWitness, LocalContext{})
 			startingGas := uint64(30_000_000)

 			_, _, err := env.Call(vm.AccountRef(sender), addrs.MIPS, input, startingGas, big.NewInt(0))

--- a/cannon/mipsevm/witness.go
+++ b/cannon/mipsevm/witness.go
 package mipsevm

-import (
-	"encoding/binary"
-	"errors"
-	"fmt"
+import "github.com/ethereum/go-ethereum/common"

-	preimage "github.com/ethereum-optimism/optimism/op-preimage"
-)
-
-type LocalContext uint64
+type LocalContext common.Hash

 type StepWitness struct {
 	// encoded state witness
@@ -21,78 +15,6 @@ type StepWitness struct {
 	PreimageOffset uint32
 }

-func uint32ToBytes32(v uint32) []byte {
-	var out [32]byte
-	binary.BigEndian.PutUint32(out[32-4:], v)
-	return out[:]
-}
-
-func uint64ToBytes32(v uint64) []byte {
-	var out [32]byte
-	binary.BigEndian.PutUint64(out[32-8:], v)
-	return out[:]
-}
-
-func (wit *StepWitness) EncodeStepInput(localContext LocalContext) []byte {
-	abiStateLen := len(wit.State)
-	if abiStateLen%32 != 0 {
-		abiStateLen += 32 - (abiStateLen % 32)
-	}
-	// pad state to 32 byte multiple per ABI
-	abiState := make([]byte, abiStateLen)
-	copy(abiState, wit.State)
-
-	var input []byte
-	input = append(input, StepBytes4...)
-	input = append(input, uint32ToBytes32(32*3)...)                          // state data offset in bytes
-	input = append(input, uint32ToBytes32(32*3+32+uint32(len(abiState)))...) // proof data offset in bytes
-	input = append(input, uint64ToBytes32(uint64(localContext))...)          // local context in bytes
-
-	input = append(input, uint32ToBytes32(uint32(len(wit.State)))...) // state data length in bytes
-	input = append(input, abiState[:]...)
-	input = append(input, uint32ToBytes32(uint32(len(wit.MemProof)))...) // proof data length in bytes
-	input = append(input, wit.MemProof[:]...)
-	return input
-}
-
 func (wit *StepWitness) HasPreimage() bool {
 	return wit.PreimageKey != ([32]byte{})
 }
-
-func (wit *StepWitness) EncodePreimageOracleInput(localContext LocalContext) ([]byte, error) {
-	if wit.PreimageKey == ([32]byte{}) {
-		return nil, errors.New("cannot encode pre-image oracle input, witness has no pre-image to proof")
-	}
-
-	switch preimage.KeyType(wit.PreimageKey[0]) {
-	case preimage.LocalKeyType:
-		if len(wit.PreimageValue) > 32+8 {
-			return nil, fmt.Errorf("local pre-image exceeds maximum size of 32 bytes with key 0x%x", wit.PreimageKey)
-		}
-		var input []byte
-		input = append(input, LoadLocalDataBytes4...)
-		input = append(input, wit.PreimageKey[:]...)
-		input = append(input, uint64ToBytes32(uint64(localContext))...) // local context in bytes
-
-		preimagePart := wit.PreimageValue[8:]
-		var tmp [32]byte
-		copy(tmp[:], preimagePart)
-		input = append(input, tmp[:]...)
-		input = append(input, uint32ToBytes32(uint32(len(wit.PreimageValue)-8))...)
-		input = append(input, uint32ToBytes32(wit.PreimageOffset)...)
-		// Note: we can pad calldata to 32 byte multiple, but don't strictly have to
-		return input, nil
-	case preimage.Keccak256KeyType:
-		var input []byte
-		input = append(input, LoadKeccak256PreimagePartBytes4...)
-		input = append(input, uint32ToBytes32(wit.PreimageOffset)...)
-		input = append(input, uint32ToBytes32(32+32)...) // partOffset, calldata offset
-		input = append(input, uint32ToBytes32(uint32(len(wit.PreimageValue))-8)...)
-		input = append(input, wit.PreimageValue[8:]...)
-		// Note: we can pad calldata to 32 byte multiple, but don't strictly have to
-		return input, nil
-	default:
-		return nil, fmt.Errorf("unsupported pre-image type %d, cannot prepare preimage with key %x offset %d for oracle",
-			wit.PreimageKey[0], wit.PreimageKey, wit.PreimageOffset)
-	}
-}
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -14,8 +14,10 @@ variable "GIT_DATE" {
  default = "0"
 }

+// The default version to embed in the built images.
+// During CI release builds this is set to <<pipeline.git.tag>>
 variable "GIT_VERSION" {
-  default = "docker"  // original default as set in proxyd file, not used by full go stack, yet
+  default = "v0.0.0"
 }

 variable "IMAGE_TAGS" {
@@ -27,98 +29,129 @@ variable "PLATFORMS" {
  // Only a specify a single platform when `--load` ing into docker.
  // Multi-platform is supported when outputting to disk or pushing to a registry.
  // Multi-platform builds can be tested locally with:  --set="*.output=type=image,push=false"
-  default = "linux/amd64"
+  default = ""
 }

-target "op-stack-go" {
+// Each of the services can have a customized version, but defaults to the global specified version.
+variable "OP_NODE_VERSION" {
+  default = "${GIT_VERSION}"
+}
+
+variable "OP_BATCHER_VERSION" {
+  default = "${GIT_VERSION}"
+}
+
+variable "OP_PROPOSER_VERSION" {
+  default = "${GIT_VERSION}"
+}
+
+variable "OP_CHALLENGER_VERSION" {
+  default = "${GIT_VERSION}"
+}
+
+variable OP_HEARTBEAT_VERSION {
+  default = "${GIT_VERSION}"
+}
+
+variable OP_PROGRAM_VERSION {
+  default = "${GIT_VERSION}"
+}
+
+variable CANNON_VERSION {
+  default = "${GIT_VERSION}"
+}
+
+target "op-node" {
  dockerfile = "ops/docker/op-stack-go/Dockerfile"
  context = "."
  args = {
    GIT_COMMIT = "${GIT_COMMIT}"
    GIT_DATE = "${GIT_DATE}"
+    OP_NODE_VERSION = "${OP_NODE_VERSION}"
  }
-  platforms = split(",", PLATFORMS)
-  tags = [for tag in split(",", IMAGE_TAGS) : "${REGISTRY}/${REPOSITORY}/op-stack-go:${tag}"]
-}
-
-target "op-node" {
-  dockerfile = "Dockerfile"
-  context = "./op-node"
-  args = {
-    OP_STACK_GO_BUILDER = "op-stack-go"
-  }
-  contexts = {
-    op-stack-go: "target:op-stack-go"
-  }
+  target = "op-node-target"
  platforms = split(",", PLATFORMS)
  tags = [for tag in split(",", IMAGE_TAGS) : "${REGISTRY}/${REPOSITORY}/op-node:${tag}"]
 }

 target "op-batcher" {
-  dockerfile = "Dockerfile"
-  context = "./op-batcher"
+  dockerfile = "ops/docker/op-stack-go/Dockerfile"
+  context = "."
  args = {
-    OP_STACK_GO_BUILDER = "op-stack-go"
-  }
-  contexts = {
-    op-stack-go: "target:op-stack-go"
+    GIT_COMMIT = "${GIT_COMMIT}"
+    GIT_DATE = "${GIT_DATE}"
+    OP_BATCHER_VERSION = "${OP_BATCHER_VERSION}"
  }
+  target = "op-batcher-target"
  platforms = split(",", PLATFORMS)
  tags = [for tag in split(",", IMAGE_TAGS) : "${REGISTRY}/${REPOSITORY}/op-batcher:${tag}"]
 }

 target "op-proposer" {
-  dockerfile = "Dockerfile"
-  context = "./op-proposer"
+  dockerfile = "ops/docker/op-stack-go/Dockerfile"
+  context = "."
  args = {
-    OP_STACK_GO_BUILDER = "op-stack-go"
-  }
-  contexts = {
-    op-stack-go: "target:op-stack-go"
+    GIT_COMMIT = "${GIT_COMMIT}"
+    GIT_DATE = "${GIT_DATE}"
+    OP_PROPOSER_VERSION = "${OP_PROPOSER_VERSION}"
  }
+  target = "op-proposer-target"
  platforms = split(",", PLATFORMS)
  tags = [for tag in split(",", IMAGE_TAGS) : "${REGISTRY}/${REPOSITORY}/op-proposer:${tag}"]
 }

 target "op-challenger" {
-  dockerfile = "Dockerfile"
-  context = "./op-challenger"
+  dockerfile = "ops/docker/op-stack-go/Dockerfile"
+  context = "."
  args = {
-    OP_STACK_GO_BUILDER = "op-stack-go"
-  }
-  contexts = {
-    op-stack-go: "target:op-stack-go"
+    GIT_COMMIT = "${GIT_COMMIT}"
+    GIT_DATE = "${GIT_DATE}"
+    OP_CHALLENGER_VERSION = "${OP_CHALLENGER_VERSION}"
  }
+  target = "op-challenger-target"
  platforms = split(",", PLATFORMS)
  tags = [for tag in split(",", IMAGE_TAGS) : "${REGISTRY}/${REPOSITORY}/op-challenger:${tag}"]
 }

 target "op-heartbeat" {
-  dockerfile = "Dockerfile"
-  context = "./op-heartbeat"
+  dockerfile = "ops/docker/op-stack-go/Dockerfile"
+  context = "."
  args = {
-    OP_STACK_GO_BUILDER = "op-stack-go"
-  }
-  contexts = {
-    op-stack-go: "target:op-stack-go"
+    GIT_COMMIT = "${GIT_COMMIT}"
+    GIT_DATE = "${GIT_DATE}"
+    OP_HEARTBEAT_VERSION = "${OP_HEARTBEAT_VERSION}"
  }
+  target = "op-heartbeat-target"
  platforms = split(",", PLATFORMS)
  tags = [for tag in split(",", IMAGE_TAGS) : "${REGISTRY}/${REPOSITORY}/op-heartbeat:${tag}"]
 }

 target "op-program" {
-  dockerfile = "Dockerfile"
-  context = "./op-program"
+  dockerfile = "ops/docker/op-stack-go/Dockerfile"
+  context = "."
  args = {
-    OP_STACK_GO_BUILDER = "op-stack-go"
-  }
-  contexts = {
-    op-stack-go: "target:op-stack-go"
+    GIT_COMMIT = "${GIT_COMMIT}"
+    GIT_DATE = "${GIT_DATE}"
+    OP_PROGRAM_VERSION = "${OP_PROGRAM_VERSION}"
  }
+  target = "op-program-target"
  platforms = split(",", PLATFORMS)
  tags = [for tag in split(",", IMAGE_TAGS) : "${REGISTRY}/${REPOSITORY}/op-program:${tag}"]
 }

+target "cannon" {
+  dockerfile = "ops/docker/op-stack-go/Dockerfile"
+  context = "."
+  args = {
+    GIT_COMMIT = "${GIT_COMMIT}"
+    GIT_DATE = "${GIT_DATE}"
+    CANNON_VERSION = "${CANNON_VERSION}"
+  }
+  target = "cannon-target"
+  platforms = split(",", PLATFORMS)
+  tags = [for tag in split(",", IMAGE_TAGS) : "${REGISTRY}/${REPOSITORY}/cannon:${tag}"]
+}
+
 target "proxyd" {
  dockerfile = "Dockerfile"
  context = "./proxyd"
@@ -180,4 +213,10 @@ target "ci-builder" {
  tags = [for tag in split(",", IMAGE_TAGS) : "${REGISTRY}/${REPOSITORY}/ci-builder:${tag}"]
 }

-
+target "contracts-bedrock" {
+  dockerfile = "./ops/docker/Dockerfile.packages"
+  context = "."
+  target = "contracts-bedrock"
+  platforms = split(",", PLATFORMS)
+  tags = [for tag in split(",", IMAGE_TAGS) : "${REGISTRY}/${REPOSITORY}/contracts-bedrock:${tag}"]
+}
--- a/docs/handbook/pr-guidelines.md
+++ b/docs/handbook/pr-guidelines.md
+# Pull Request Guidelines and Best Practices
+
+<!-- START doctoc generated TOC please keep comment here to allow auto update -->
+<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
+
+- [Overview](#overview)
+- [PR Lifecycle Best Practices](#pr-lifecycle-best-practices)
+  - [Before Starting PRs](#before-starting-prs)
+  - [Opening PRs](#opening-prs)
+  - [Reviewing PRs](#reviewing-prs)
+  - [Merging PRs](#merging-prs)
+
+<!-- END doctoc generated TOC please keep comment here to allow auto update -->
+
+## Overview
+
+This document contains guidelines best practices for PRs that should be enforced as much as possible. The motivations and goals behind these best practices are:
+
+- **Ensure thorough reviews**: By the time the PR is merged, at least one other person—because there is always at least one reviewer—should understand the PR’s changes just as well as the PR author. This helps improve security by reducing bugs and single points of failure (i.e. there should never be only one person who understands certain code).
+- **Reduce PR churn**: PRs should be quickly reviewable and mergeable without much churn (both in terms of code rewrites and comment cycles). This saves time by reducing the number of rebases due to conflicts. Similarly, too many review cycles is a burden for both PR authors and reviewers, and results in “review fatigue” where reviews become less careful and thorough, increasing the likelihood of bugs.
+- **Traceability**: We should be able to look back at issues and PRs to understand why a certain decision was made or why a given approach was taken.
+
+## PR Lifecycle Best Practices
+
+This is organized by current state of PR, so it can be easily be referenced frequently to help internalize the guidelines.
+
+### Before Starting PRs
+
+- **Keep PRs Focused**: Each PR should be a single, narrow, well-defined scope.
+
+### Opening PRs
+
+- **Review Your Own Code**: Reviewing the diff yourself *in a different context*, can be very useful for discovering issues, typos, and bugs before opening the PR. For example, write code in your IDE, then review it in the GitHub diff view. The perspective change forces you to slow down and helps reveal issues you may have missed.
+- **Explain Decisions/Tradeoffs**: Explain rationale for any design/architecture decisions and implementation details in the PR description. If it closes an issue, remember to mention the issue it closes, e.g. `Closes <issueUrl>`. Otherwise, just link to the issue. If there is no issue, whatever details would have been in the issue should be in the PR description.
+- **Guide PR reviewers:** Let them know about areas of concern, under-tested areas, or vague requirements that should be ironed out.
+
+### Reviewing PRs
+
+- **Verify Requirements are Met**: If the PR claims to fix or close an issue, check that all the requirements in the issue are actually met. Otherwise the issue may be in a good place to merge, but just shouldn’t close the issue.
+- **Focus on Tests**: The tests are the spec and therefore should be the focus of reviews. If tests are thorough and passing, the rest is an implementation detail (to an extent—don’t skip source code reviews) that can be fixed in a future optimization/cleanup PR. Make sure edge case behaviors are defined and handled.
+- **Think like an Auditor:** What edge cases were ignored? How can the code break? When might it behave incorrectly and unexpectedly? What code should have been changed that isn’t in the diff? What implicit assumptions are made that might be invalid?
+- **Ensure Comment Significance is Clear**: Indicate which comments are nits/optionals that the PR author can resolve, compared to which you want to follow up on.
+    - Prefix non-blocking comments with `[nit]` or `[non-blocking]`.
+- **Consider Reviewing in Your IDE**: For example, GitHub has [this VSCode extension](https://marketplace.visualstudio.com/items?itemName=GitHub.vscode-pull-request-github) to review PRs. This provides more code context and enables review to benefit from your standard lints and IDE features, whereas GitHub’s diff shows none of that.
+
+### Merging PRs
+
+- **Resolve all Comments**: Comments can be resolved by (1) the PR author for nits/optionals, (2) the author or reviewer after discussions, or (3) extracting the comment into an issue to address in a future PR. For (3), ensure the new issue links to the specific comment thread. This is currently enforced by GitHub's merge requirements.
+- **Other Standard Merge Requirements**: The PR must be approved by the appropriate reviewers, CI must passing, and other standard merge requirements apply.
--- a/go.mod
+++ b/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0
 	github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3
 	github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20231030223232-e16eae11e492
-	github.com/ethereum/go-ethereum v1.13.1
+	github.com/ethereum/go-ethereum v1.13.5
 	github.com/fsnotify/fsnotify v1.7.0
 	github.com/go-chi/chi/v5 v5.0.10
 	github.com/go-chi/docgen v1.2.0
@@ -71,7 +71,7 @@ require (
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/crate-crypto/go-ipa v0.0.0-20230601170251-1830d0757c80 // indirect
-	github.com/crate-crypto/go-kzg-4844 v0.3.0 // indirect
+	github.com/crate-crypto/go-kzg-4844 v0.7.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
 	github.com/deckarep/golang-set/v2 v2.1.0 // indirect
@@ -81,7 +81,7 @@ require (
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/dop251/goja v0.0.0-20230806174421-c933cf95e127 // indirect
 	github.com/elastic/gosigar v0.14.2 // indirect
-	github.com/ethereum/c-kzg-4844 v0.3.1 // indirect
+	github.com/ethereum/c-kzg-4844 v0.4.0 // indirect
 	github.com/fatih/color v1.13.0 // indirect
 	github.com/felixge/fgprof v0.9.3 // indirect
 	github.com/fjl/memsize v0.0.1 // indirect
@@ -210,7 +210,7 @@ require (
 	rsc.io/tmplfunc v0.0.3 // indirect
 )

-replace github.com/ethereum/go-ethereum v1.13.1 => github.com/ethereum-optimism/op-geth v1.101304.0-rc.2.0.20231030225546-cd491fa3b588
+replace github.com/ethereum/go-ethereum v1.13.5 => github.com/ethereum-optimism/op-geth v1.101304.2-0.20231123204650-32ddd8bd7cfe

 //replace github.com/ethereum-optimism/superchain-registry/superchain => ../superchain-registry/superchain
-//replace github.com/ethereum/go-ethereum v1.13.1 => ../go-ethereum
+//replace github.com/ethereum/go-ethereum v1.13.5 => ../go-ethereum
--- a/go.sum
+++ b/go.sum
@@ -103,8 +103,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHH
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/crate-crypto/go-ipa v0.0.0-20230601170251-1830d0757c80 h1:DuBDHVjgGMPki7bAyh91+3cF1Vh34sAEdH8JQgbc2R0=
 github.com/crate-crypto/go-ipa v0.0.0-20230601170251-1830d0757c80/go.mod h1:gzbVz57IDJgQ9rLQwfSk696JGWof8ftznEL9GoAv3NI=
-github.com/crate-crypto/go-kzg-4844 v0.3.0 h1:UBlWE0CgyFqqzTI+IFyCzA7A3Zw4iip6uzRv5NIXG0A=
-github.com/crate-crypto/go-kzg-4844 v0.3.0/go.mod h1:SBP7ikXEgDnUPONgm33HtuDZEDtWa3L4QtN1ocJSEQ4=
+github.com/crate-crypto/go-kzg-4844 v0.7.0 h1:C0vgZRk4q4EZ/JgPfzuSoxdCq3C3mOZMBShovmncxvA=
+github.com/crate-crypto/go-kzg-4844 v0.7.0/go.mod h1:1kMhvPgI0Ky3yIa+9lFySEBUBXkYxeOi8ZF1sYioxhc=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
@@ -134,8 +134,6 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm
 github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
 github.com/dlclark/regexp2 v1.7.0 h1:7lJfhqlPssTb1WQx4yvTHN0uElPEv52sbaECrAQxjAo=
 github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
-github.com/docker/docker v24.0.5+incompatible h1:WmgcE4fxyI6EEXxBRxsHnZXrO1pQ3smi0k/jho4HLeY=
-github.com/docker/docker v24.0.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
@@ -151,12 +149,12 @@ github.com/elastic/gosigar v0.14.2 h1:Dg80n8cr90OZ7x+bAax/QjoW/XqTI11RmA79ZwIm9/
 github.com/elastic/gosigar v0.14.2/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs=
 github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3 h1:RWHKLhCrQThMfch+QJ1Z8veEq5ZO3DfIhZ7xgRP9WTc=
 github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3/go.mod h1:QziizLAiF0KqyLdNJYD7O5cpDlaFMNZzlxYNcWsJUxs=
-github.com/ethereum-optimism/op-geth v1.101304.0-rc.2.0.20231030225546-cd491fa3b588 h1:jrvFoV3aSGJcTT8Pyo8R2Sp7CZ0v3hqrdhfSmyZbJVw=
-github.com/ethereum-optimism/op-geth v1.101304.0-rc.2.0.20231030225546-cd491fa3b588/go.mod h1:12W+vBetjYbDj5D2+V8hizke5yWuLrUDf7UmVkXTnCQ=
+github.com/ethereum-optimism/op-geth v1.101304.2-0.20231123204650-32ddd8bd7cfe h1:fh0BJoqdlp2CY9gPNrc/xM6nrwb84j82dFzIyq42cBM=
+github.com/ethereum-optimism/op-geth v1.101304.2-0.20231123204650-32ddd8bd7cfe/go.mod h1:KyXcYdAJTSm8tvOmd+KPeOygiA+FEE5VX3vs2WwjwQ4=
 github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20231030223232-e16eae11e492 h1:FyzLzMLKMc9zcDYcSxbrLDglIRrGQJE9juFzIO35RmE=
 github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20231030223232-e16eae11e492/go.mod h1:/70H/KqrtKcvWvNGVj6S3rAcLC+kUPr3t2aDmYIS+Xk=
-github.com/ethereum/c-kzg-4844 v0.3.1 h1:sR65+68+WdnMKxseNWxSJuAv2tsUrihTpVBTfM/U5Zg=
-github.com/ethereum/c-kzg-4844 v0.3.1/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0=
+github.com/ethereum/c-kzg-4844 v0.4.0 h1:3MS1s4JtA868KpJxroZoepdV0ZKBp3u/O5HcZ7R3nlY=
+github.com/ethereum/c-kzg-4844 v0.4.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0=
 github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 github.com/felixge/fgprof v0.9.3 h1:VvyZxILNuCiUCSXtPtYmmtGvb65nqXh2QFWc0Wpf2/g=

--- a/indexer/Dockerfile
+++ b/indexer/Dockerfile
@@ -14,6 +14,7 @@ COPY ./indexer /app/indexer
 COPY ./op-bindings /app/op-bindings
 COPY ./op-service /app/op-service
 COPY ./op-node /app/op-node
+COPY ./op-chain-ops /app/op-chain-ops

 WORKDIR /app/indexer


--- a/indexer/api-ts/package.json
+++ b/indexer/api-ts/package.json
@@ -33,7 +33,7 @@
    "url": "https://github.com/ethereum-optimism/optimism.git"
  },
  "devDependencies": {
-    "tsup": "^7.2.0",
+    "tsup": "^8.0.1",
    "vitest": "^0.34.4"
  }
 }
--- a/indexer/database/bridge_messages.go
+++ b/indexer/database/bridge_messages.go
@@ -39,6 +39,11 @@ type L2BridgeMessage struct {
 	TransactionWithdrawalHash common.Hash `gorm:"serializer:bytes"`
 }

+type L2BridgeMessageVersionedMessageHash struct {
+	MessageHash   common.Hash `gorm:"primaryKey;serializer:bytes"`
+	V1MessageHash common.Hash `gorm:"serializer:bytes"`
+}
+
 type BridgeMessagesView interface {
 	L1BridgeMessage(common.Hash) (*L1BridgeMessage, error)
 	L1BridgeMessageWithFilter(BridgeMessage) (*L1BridgeMessage, error)
@@ -55,6 +60,8 @@ type BridgeMessagesDB interface {

 	StoreL2BridgeMessages([]L2BridgeMessage) error
 	MarkRelayedL2BridgeMessage(common.Hash, uuid.UUID) error
+
+	StoreL2BridgeMessageV1MessageHashes([]L2BridgeMessageVersionedMessageHash) error
 }

 /**
@@ -134,8 +141,33 @@ func (db bridgeMessagesDB) StoreL2BridgeMessages(messages []L2BridgeMessage) err
 	return result.Error
 }

+func (db bridgeMessagesDB) StoreL2BridgeMessageV1MessageHashes(versionedHashes []L2BridgeMessageVersionedMessageHash) error {
+	deduped := db.gorm.Clauses(clause.OnConflict{Columns: []clause.Column{{Name: "message_hash"}}, DoNothing: true})
+	result := deduped.Create(&versionedHashes)
+	if result.Error == nil && int(result.RowsAffected) < len(versionedHashes) {
+		db.log.Warn("ignored L2 bridge v1 message hash duplicates", "duplicates", len(versionedHashes)-int(result.RowsAffected))
+	}
+
+	return result.Error
+}
+
 func (db bridgeMessagesDB) L2BridgeMessage(msgHash common.Hash) (*L2BridgeMessage, error) {
-	return db.L2BridgeMessageWithFilter(BridgeMessage{MessageHash: msgHash})
+	message, err := db.L2BridgeMessageWithFilter(BridgeMessage{MessageHash: msgHash})
+	if message != nil || err != nil {
+		return message, err
+	}
+
+	// check if this is a v1 hash of an older message
+	versioned := L2BridgeMessageVersionedMessageHash{V1MessageHash: msgHash}
+	result := db.gorm.Where(&versioned).Take(&versioned)
+	if result.Error != nil {
+		if errors.Is(result.Error, gorm.ErrRecordNotFound) {
+			return nil, nil
+		}
+		return nil, result.Error
+	}
+
+	return db.L2BridgeMessageWithFilter(BridgeMessage{MessageHash: versioned.MessageHash})
 }

 func (db bridgeMessagesDB) L2BridgeMessageWithFilter(filter BridgeMessage) (*L2BridgeMessage, error) {

--- a/indexer/database/bridge_transactions.go
+++ b/indexer/database/bridge_transactions.go
@@ -133,10 +133,10 @@ func (db *bridgeTransactionsDB) L1LatestFinalizedBlockHeader() (*L1BlockHeader,
 	provenQuery = provenQuery.Order("l1_contract_events.timestamp DESC").Select("l1_contract_events.*")

 	finalizedQuery := db.gorm.Table("l2_transaction_withdrawals").Order("timestamp DESC").Limit(1)
-	finalizedQuery = finalizedQuery.Joins("INNER JOIN l1_contract_events ON l1_contract_events.guid = l2_transaction_withdrawals.proven_l1_event_guid")
+	finalizedQuery = finalizedQuery.Joins("INNER JOIN l1_contract_events ON l1_contract_events.guid = l2_transaction_withdrawals.finalized_l1_event_guid")
 	finalizedQuery = finalizedQuery.Select("l1_contract_events.*")

-	relayedQuery := db.gorm.Table("l2_bridge_messages").Order("timestamp DESC")
+	relayedQuery := db.gorm.Table("l2_bridge_messages").Order("timestamp DESC").Limit(1)
 	relayedQuery = relayedQuery.Joins("INNER JOIN l1_contract_events ON l1_contract_events.guid = l2_bridge_messages.relayed_message_event_guid")
 	relayedQuery = relayedQuery.Select("l1_contract_events.*")

@@ -227,49 +227,22 @@ func (db *bridgeTransactionsDB) MarkL2TransactionWithdrawalFinalizedEvent(withdr
 }

 func (db *bridgeTransactionsDB) L2LatestBlockHeader() (*L2BlockHeader, error) {
-	// L2: Latest Withdrawal, Latest L2 Header of indexed deposit epoch
-	var latestWithdrawalHeader, latestL2DepositHeader *L2BlockHeader
-
-	var withdrawHeader L2BlockHeader
-	withdrawalQuery := db.gorm.Table("l2_transaction_withdrawals").Order("timestamp DESC").Limit(1)
-	withdrawalQuery = withdrawalQuery.Joins("INNER JOIN l2_contract_events ON l2_contract_events.guid = l2_transaction_withdrawals.initiated_l2_event_guid")
-	withdrawalQuery = withdrawalQuery.Joins("INNER JOIN l2_block_headers ON l2_block_headers.hash = l2_contract_events.block_hash")
-	result := withdrawalQuery.Select("l2_block_headers.*").Take(&withdrawHeader)
-	if result.Error != nil && !errors.Is(result.Error, gorm.ErrRecordNotFound) {
-		return nil, result.Error
-	} else if !errors.Is(result.Error, gorm.ErrRecordNotFound) {
-		latestWithdrawalHeader = &withdrawHeader
-	}
+	// L2: Latest Withdrawal
+	l2Query := db.gorm.Table("l2_transaction_withdrawals").Order("timestamp DESC")
+	l2Query = l2Query.Joins("INNER JOIN l2_contract_events ON l2_contract_events.guid = l2_transaction_withdrawals.initiated_l2_event_guid")
+	l2Query = l2Query.Joins("INNER JOIN l2_block_headers ON l2_block_headers.hash = l2_contract_events.block_hash")
+	l2Query = l2Query.Select("l2_block_headers.*")

-	// Check for any deposits that may have been included after the latest withdrawal. However, since the bridge
-	// processor only inserts entries when the corresponding epoch has been indexed on both L1 and L2, we can
-	// simply look for the latest L2 block with at <= time of the latest L1 deposit.
-	var l1Deposit L1TransactionDeposit
-	result = db.gorm.Table("l1_transaction_deposits").Order("timestamp DESC").Limit(1).Take(&l1Deposit)
-	if result.Error != nil && !errors.Is(result.Error, gorm.ErrRecordNotFound) {
-		return nil, result.Error
-	} else if !errors.Is(result.Error, gorm.ErrRecordNotFound) {
-		var l2DepositHeader L2BlockHeader
-		result := db.gorm.Table("l2_block_headers").Order("timestamp DESC").Limit(1).Where("timestamp <= ?", l1Deposit.Tx.Timestamp).Take(&l2DepositHeader)
-		if result.Error != nil && !errors.Is(result.Error, gorm.ErrRecordNotFound) {
-			return nil, result.Error
-		} else if !errors.Is(result.Error, gorm.ErrRecordNotFound) {
-			latestL2DepositHeader = &l2DepositHeader
+	var l2Header L2BlockHeader
+	result := l2Query.Take(&l2Header)
+	if result.Error != nil {
+		if errors.Is(result.Error, gorm.ErrRecordNotFound) {
+			return nil, nil
 		}
+		return nil, result.Error
 	}

-	// compare
-	if latestWithdrawalHeader == nil {
-		return latestL2DepositHeader, nil
-	} else if latestL2DepositHeader == nil {
-		return latestWithdrawalHeader, nil
-	}
-
-	if latestWithdrawalHeader.Timestamp >= latestL2DepositHeader.Timestamp {
-		return latestWithdrawalHeader, nil
-	} else {
-		return latestL2DepositHeader, nil
-	}
+	return &l2Header, nil
 }

 func (db *bridgeTransactionsDB) L2LatestFinalizedBlockHeader() (*L2BlockHeader, error) {

--- a/indexer/e2e_tests/setup.go
+++ b/indexer/e2e_tests/setup.go
@@ -13,8 +13,10 @@ import (
 	"github.com/ethereum-optimism/optimism/indexer/client"
 	"github.com/ethereum-optimism/optimism/indexer/config"
 	"github.com/ethereum-optimism/optimism/indexer/database"
+	"github.com/prometheus/client_golang/prometheus"

 	op_e2e "github.com/ethereum-optimism/optimism/op-e2e"
+	"github.com/ethereum-optimism/optimism/op-service/metrics"
 	"github.com/ethereum-optimism/optimism/op-service/testlog"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/log"
@@ -30,7 +32,8 @@ import (
 */

 type E2ETestSuite struct {
-	t *testing.T
+	t               *testing.T
+	MetricsRegistry *prometheus.Registry

 	// API
 	Client *client.Client
@@ -152,14 +155,15 @@ func createE2ETestSuite(t *testing.T) E2ETestSuite {
 	require.NoError(t, err, "must open indexer API client")

 	return E2ETestSuite{
-		t:        t,
-		Client:   client,
-		DB:       ix.DB,
-		Indexer:  ix,
-		OpCfg:    &opCfg,
-		OpSys:    opSys,
-		L1Client: opSys.Clients["l1"],
-		L2Client: opSys.Clients["sequencer"],
+		t:               t,
+		MetricsRegistry: metrics.NewRegistry(),
+		Client:          client,
+		DB:              ix.DB,
+		Indexer:         ix,
+		OpCfg:           &opCfg,
+		OpSys:           opSys,
+		L1Client:        opSys.Clients["l1"],
+		L2Client:        opSys.Clients["sequencer"],
 	}
 }


--- a/indexer/e2e_tests/utils/cross_domain_messages.go
+++ b/indexer/e2e_tests/utils/cross_domain_messages.go
@@ -4,12 +4,11 @@ import (
 	"errors"
 	"math/big"

-	"github.com/ethereum-optimism/optimism/indexer/processors/contracts"
 	"github.com/ethereum-optimism/optimism/op-bindings/bindings"
+	"github.com/ethereum-optimism/optimism/op-chain-ops/crossdomain"

 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
 )

 type CrossDomainMessengerSentMessage struct {
@@ -40,7 +39,17 @@ func ParseCrossDomainMessage(sentMessageReceipt *types.Receipt) (CrossDomainMess
 			if err != nil {
 				return CrossDomainMessengerSentMessage{}, err
 			}
-			msgHash, err := CrossDomainMessengerSentMessageHash(sentMessage, sentMessageExtension.Value)
+
+			msg := crossdomain.NewCrossDomainMessage(
+				sentMessage.MessageNonce,
+				sentMessage.Sender,
+				sentMessage.Target,
+				sentMessageExtension.Value,
+				sentMessage.GasLimit,
+				sentMessage.Message,
+			)
+
+			msgHash, err := msg.Hash()
 			if err != nil {
 				return CrossDomainMessengerSentMessage{}, err
 			}
@@ -51,17 +60,3 @@ func ParseCrossDomainMessage(sentMessageReceipt *types.Receipt) (CrossDomainMess

 	return CrossDomainMessengerSentMessage{}, errors.New("missing SentMessage receipts")
 }
-
-func CrossDomainMessengerSentMessageHash(sentMessage *bindings.CrossDomainMessengerSentMessage, value *big.Int) (common.Hash, error) {
-	abi, err := bindings.CrossDomainMessengerMetaData.GetAbi()
-	if err != nil {
-		return common.Hash{}, err
-	}
-
-	calldata, err := contracts.CrossDomainMessageCalldata(abi, sentMessage, value)
-	if err != nil {
-		return common.Hash{}, err
-	}
-
-	return crypto.Keccak256Hash(calldata), nil
-}
--- a/indexer/migrations/20230523_create_schema.sql
+++ b/indexer/migrations/20230523_create_schema.sql
@@ -176,6 +176,22 @@ CREATE INDEX IF NOT EXISTS l2_bridge_messages_timestamp ON l2_bridge_messages(ti
 CREATE INDEX IF NOT EXISTS l2_bridge_messages_transaction_withdrawal_hash ON l2_bridge_messages(transaction_withdrawal_hash);
 CREATE INDEX IF NOT EXISTS l2_bridge_messages_from_address ON l2_bridge_messages(from_address);

+/**
+ * Since the CDM uses the latest versioned message hash when emitting the `RelayedMessage` event, we need
+ * to keep track of all of the future versions of message hashes such that legacy messages can be queried
+ * queried for when relayed on L1 
+ *
+ * As new the CDM is updated with new versions, we need to ensure that there's a better way to correlate message between
+ * chains (adding the message nonce to the RelayedMessage event) or continue to add columns to this table and migrate
+ * unrelayed messages such that finalization logic can handle switching between the varying versioned message hashes
+ */
+CREATE TABLE IF NOT EXISTS l2_bridge_message_versioned_message_hashes(
+    message_hash     VARCHAR PRIMARY KEY NOT NULL UNIQUE REFERENCES l2_bridge_messages(message_hash),
+
+    -- only filled in if `message_hash` is for a v0 message
+    v1_message_hash  VARCHAR UNIQUE
+);
+
 -- StandardBridge
 CREATE TABLE IF NOT EXISTS l1_bridge_deposits (
    transaction_source_hash   VARCHAR PRIMARY KEY REFERENCES l1_transaction_deposits(source_hash) ON DELETE CASCADE,

--- a/indexer/processors/bridge.go
+++ b/indexer/processors/bridge.go
@@ -256,7 +256,7 @@ func (b *BridgeProcessor) processInitiatedL2Events() error {

 			legacyBridgeLog := l2BridgeLog.New("mode", "legacy", "from_block_number", legacyFromL2Height, "to_block_number", legacyToL2Height)
 			legacyBridgeLog.Info("scanning for initiated bridge events")
-			if err := bridge.LegacyL2ProcessInitiatedBridgeEvents(legacyBridgeLog, tx, b.metrics, b.chainConfig.L2Contracts, legacyFromL2Height, legacyToL2Height); err != nil {
+			if err := bridge.LegacyL2ProcessInitiatedBridgeEvents(legacyBridgeLog, tx, b.metrics, b.chainConfig.Preset, b.chainConfig.L2Contracts, legacyFromL2Height, legacyToL2Height); err != nil {
 				return err
 			} else if legacyToL2Height.Cmp(toL2Height) == 0 {
 				return nil // a-ok! Entire range was legacy blocks
@@ -312,7 +312,7 @@ func (b *BridgeProcessor) processFinalizedL1Events() error {

 			legacyBridgeLog := l1BridgeLog.New("mode", "legacy", "from_block_number", legacyFromL1Height, "to_block_number", legacyToL1Height)
 			legacyBridgeLog.Info("scanning for finalized bridge events")
-			if err := bridge.LegacyL1ProcessFinalizedBridgeEvents(legacyBridgeLog, tx, b.metrics, b.l1Etl.EthClient, b.chainConfig.L1Contracts, legacyFromL1Height, legacyToL1Height); err != nil {
+			if err := bridge.LegacyL1ProcessFinalizedBridgeEvents(legacyBridgeLog, tx, b.metrics, b.chainConfig.L1Contracts, legacyFromL1Height, legacyToL1Height); err != nil {
 				return err
 			} else if legacyToL1Height.Cmp(toL1Height) == 0 {
 				return nil // a-ok! Entire range was legacy blocks

--- a/indexer/processors/bridge/l1_bridge_processor.go
+++ b/indexer/processors/bridge/l1_bridge_processor.go
@@ -7,6 +7,7 @@ import (
 	"github.com/ethereum-optimism/optimism/indexer/bigint"
 	"github.com/ethereum-optimism/optimism/indexer/config"
 	"github.com/ethereum-optimism/optimism/indexer/database"
+	"github.com/ethereum-optimism/optimism/indexer/processors/bridge/ovm1"
 	"github.com/ethereum-optimism/optimism/indexer/processors/contracts"

 	"github.com/ethereum/go-ethereum/common"
@@ -74,14 +75,15 @@ func L1ProcessInitiatedBridgeEvents(log log.Logger, db *database.DB, metrics L1M
 		// extract the deposit hash from the previous TransactionDepositedEvent
 		portalDeposit, ok := portalDeposits[logKey{sentMessage.Event.BlockHash, sentMessage.Event.LogIndex - 1}]
 		if !ok {
-			log.Error("expected TransactionDeposit preceding SentMessage event", "tx_hash", sentMessage.Event.TransactionHash.String())
 			return fmt.Errorf("expected TransactionDeposit preceding SentMessage event. tx_hash = %s", sentMessage.Event.TransactionHash.String())
 		} else if portalDeposit.Event.TransactionHash != sentMessage.Event.TransactionHash {
-			log.Error("correlated events tx hash mismatch", "deposit_tx_hash", portalDeposit.Event.TransactionHash.String(), "message_tx_hash", sentMessage.Event.TransactionHash.String())
-			return fmt.Errorf("correlated events tx hash mismatch")
+			return fmt.Errorf("correlated events tx hash mismatch. deposit_tx_hash = %s, message_tx_hash = %s", portalDeposit.Event.TransactionHash, sentMessage.Event.TransactionHash)
 		}

-		bridgeMessages[i] = database.L1BridgeMessage{TransactionSourceHash: portalDeposit.DepositTx.SourceHash, BridgeMessage: sentMessage.BridgeMessage}
+		bridgeMessages[i] = database.L1BridgeMessage{
+			TransactionSourceHash: portalDeposit.DepositTx.SourceHash,
+			BridgeMessage:         sentMessage.BridgeMessage,
+		}
 	}
 	if len(bridgeMessages) > 0 {
 		if err := db.BridgeMessages.StoreL1BridgeMessages(bridgeMessages); err != nil {
@@ -107,20 +109,16 @@ func L1ProcessInitiatedBridgeEvents(log log.Logger, db *database.DB, metrics L1M
 		// extract the cross domain message hash & deposit source hash from the following events
 		portalDeposit, ok := portalDeposits[logKey{initiatedBridge.Event.BlockHash, initiatedBridge.Event.LogIndex + 1}]
 		if !ok {
-			log.Error("expected TransactionDeposit following BridgeInitiated event", "tx_hash", initiatedBridge.Event.TransactionHash.String())
-			return fmt.Errorf("expected TransactionDeposit following BridgeInitiated event. tx_hash = %s", initiatedBridge.Event.TransactionHash.String())
+			return fmt.Errorf("expected TransactionDeposit following BridgeInitiated event. tx_hash = %s", initiatedBridge.Event.TransactionHash)
 		} else if portalDeposit.Event.TransactionHash != initiatedBridge.Event.TransactionHash {
-			log.Error("correlated events tx hash mismatch", "deposit_tx_hash", portalDeposit.Event.TransactionHash.String(), "bridge_tx_hash", initiatedBridge.Event.TransactionHash.String())
-			return fmt.Errorf("correlated events tx hash mismatch")
+			return fmt.Errorf("correlated events tx hash mismatch, bridge_tx_hash = %s, deposit_tx_hash = %s", initiatedBridge.Event.TransactionHash, portalDeposit.Event.TransactionHash)
 		}

 		sentMessage, ok := sentMessages[logKey{initiatedBridge.Event.BlockHash, initiatedBridge.Event.LogIndex + 2}]
 		if !ok {
-			log.Error("expected SentMessage following BridgeInitiated event", "tx_hash", initiatedBridge.Event.TransactionHash.String())
-			return fmt.Errorf("expected SentMessage following BridgeInitiated event. tx_hash = %s", initiatedBridge.Event.TransactionHash.String())
+			return fmt.Errorf("expected SentMessage following BridgeInitiated event. tx_hash = %s", initiatedBridge.Event.TransactionHash)
 		} else if sentMessage.Event.TransactionHash != initiatedBridge.Event.TransactionHash {
-			log.Error("correlated events tx hash mismatch", "message_tx_hash", sentMessage.Event.TransactionHash.String(), "bridge_tx_hash", initiatedBridge.Event.TransactionHash.String())
-			return fmt.Errorf("correlated events tx hash mismatch")
+			return fmt.Errorf("correlated events tx hash mismatch. bridge_tx_hash = %s, message_tx_hash = %s", initiatedBridge.Event.TransactionHash, sentMessage.Event.TransactionHash)
 		}

 		bridgedTokens[initiatedBridge.BridgeTransfer.TokenPair.LocalTokenAddress]++
@@ -158,23 +156,30 @@ func L1ProcessFinalizedBridgeEvents(log log.Logger, db *database.DB, metrics L1M
 		log.Info("detected proven withdrawals", "size", len(provenWithdrawals))
 	}

+	skippedOVM1ProvenWithdrawals := 0
 	for i := range provenWithdrawals {
-		proven := provenWithdrawals[i]
-		withdrawal, err := db.BridgeTransactions.L2TransactionWithdrawal(proven.WithdrawalHash)
+		provenWithdrawal := provenWithdrawals[i]
+		withdrawal, err := db.BridgeTransactions.L2TransactionWithdrawal(provenWithdrawal.WithdrawalHash)
 		if err != nil {
 			return err
 		} else if withdrawal == nil {
-			log.Error("missing indexed withdrawal on proven event!", "tx_hash", proven.Event.TransactionHash.String())
-			return fmt.Errorf("missing indexed withdrawal! tx_hash = %s", proven.Event.TransactionHash.String())
+			if _, ok := ovm1.PortalWithdrawalTransactions[provenWithdrawal.WithdrawalHash]; ok {
+				skippedOVM1ProvenWithdrawals++
+				continue
+			}
+			return fmt.Errorf("missing indexed withdrawal! tx_hash = %s", provenWithdrawal.Event.TransactionHash)
 		}

-		if err := db.BridgeTransactions.MarkL2TransactionWithdrawalProvenEvent(proven.WithdrawalHash, provenWithdrawals[i].Event.GUID); err != nil {
-			log.Error("failed to mark withdrawal as proven", "err", err, "tx_hash", proven.Event.TransactionHash.String())
-			return err
+		if err := db.BridgeTransactions.MarkL2TransactionWithdrawalProvenEvent(provenWithdrawal.WithdrawalHash, provenWithdrawals[i].Event.GUID); err != nil {
+			return fmt.Errorf("failed to mark withdrawal as proven. tx_hash = %s: %w", provenWithdrawal.Event.TransactionHash, err)
 		}
 	}
 	if len(provenWithdrawals) > 0 {
 		metrics.RecordL1ProvenWithdrawals(len(provenWithdrawals))
+		if skippedOVM1ProvenWithdrawals > 0 {
+			metrics.RecordL1SkippedOVM1ProvenWithdrawals(skippedOVM1ProvenWithdrawals)
+			log.Info("skipped OVM 1.0 proven withdrawals", "size", skippedOVM1ProvenWithdrawals)
+		}
 	}

 	// (2) OptimismPortal (finalized withdrawals)
@@ -186,23 +191,30 @@ func L1ProcessFinalizedBridgeEvents(log log.Logger, db *database.DB, metrics L1M
 		log.Info("detected finalized withdrawals", "size", len(finalizedWithdrawals))
 	}

+	skippedOVM1FinalizedWithdrawals := 0
 	for i := range finalizedWithdrawals {
 		finalizedWithdrawal := finalizedWithdrawals[i]
 		withdrawal, err := db.BridgeTransactions.L2TransactionWithdrawal(finalizedWithdrawal.WithdrawalHash)
 		if err != nil {
 			return err
 		} else if withdrawal == nil {
-			log.Error("missing indexed withdrawal on finalization event!", "tx_hash", finalizedWithdrawal.Event.TransactionHash.String())
-			return fmt.Errorf("missing indexed withdrawal on finalization! tx_hash: %s", finalizedWithdrawal.Event.TransactionHash.String())
+			if _, ok := ovm1.PortalWithdrawalTransactions[finalizedWithdrawal.WithdrawalHash]; ok {
+				skippedOVM1FinalizedWithdrawals++
+				continue
+			}
+			return fmt.Errorf("missing indexed withdrawal on finalization! tx_hash = %s", finalizedWithdrawal.Event.TransactionHash.String())
 		}

 		if err = db.BridgeTransactions.MarkL2TransactionWithdrawalFinalizedEvent(finalizedWithdrawal.WithdrawalHash, finalizedWithdrawal.Event.GUID, finalizedWithdrawal.Success); err != nil {
-			log.Error("failed to mark withdrawal as finalized", "err", err, "tx_hash", finalizedWithdrawal.Event.TransactionHash.String())
-			return err
+			return fmt.Errorf("failed to mark withdrawal as finalized. tx_hash = %s: %w", finalizedWithdrawal.Event.TransactionHash, err)
 		}
 	}
 	if len(finalizedWithdrawals) > 0 {
 		metrics.RecordL1FinalizedWithdrawals(len(finalizedWithdrawals))
+		if skippedOVM1ProvenWithdrawals > 0 {
+			metrics.RecordL1SkippedOVM1FinalizedWithdrawals(skippedOVM1FinalizedWithdrawals)
+			log.Info("skipped OVM 1.0 finalized withdrawals", "size", skippedOVM1FinalizedWithdrawals)
+		}
 	}

 	// (3) L1CrossDomainMessenger
@@ -214,23 +226,30 @@ func L1ProcessFinalizedBridgeEvents(log log.Logger, db *database.DB, metrics L1M
 		log.Info("detected relayed messages", "size", len(crossDomainRelayedMessages))
 	}

+	skippedOVM1Messages := 0
 	for i := range crossDomainRelayedMessages {
-		relayed := crossDomainRelayedMessages[i]
-		message, err := db.BridgeMessages.L2BridgeMessage(relayed.MessageHash)
+		relayedMessage := crossDomainRelayedMessages[i]
+		message, err := db.BridgeMessages.L2BridgeMessage(relayedMessage.MessageHash)
 		if err != nil {
 			return err
 		} else if message == nil {
-			log.Error("missing indexed L2CrossDomainMessenger message", "tx_hash", relayed.Event.TransactionHash.String())
-			return fmt.Errorf("missing indexed L2CrossDomainMessager message. tx_hash %s", relayed.Event.TransactionHash.String())
+			if _, ok := ovm1.L1RelayedMessages[relayedMessage.MessageHash]; ok {
+				skippedOVM1Messages++
+				continue
+			}
+			return fmt.Errorf("missing indexed L2CrossDomainMessager message! tx_hash = %s", relayedMessage.Event.TransactionHash.String())
 		}

-		if err := db.BridgeMessages.MarkRelayedL2BridgeMessage(relayed.MessageHash, relayed.Event.GUID); err != nil {
-			log.Error("failed to relay cross domain message", "err", err, "tx_hash", relayed.Event.TransactionHash.String())
-			return err
+		if err := db.BridgeMessages.MarkRelayedL2BridgeMessage(relayedMessage.MessageHash, relayedMessage.Event.GUID); err != nil {
+			return fmt.Errorf("failed to relay cross domain message. tx_hash = %s: %w", relayedMessage.Event.TransactionHash, err)
 		}
 	}
 	if len(crossDomainRelayedMessages) > 0 {
 		metrics.RecordL1CrossDomainRelayedMessages(len(crossDomainRelayedMessages))
+		if skippedOVM1Messages > 0 { // Logged as a warning just for visibility
+			metrics.RecordL1SkippedOVM1CrossDomainRelayedMessages(skippedOVM1Messages)
+			log.Info("skipped OVM 1.0 relayed L2CrossDomainMessenger withdrawals", "size", skippedOVM1Messages)
+		}
 	}

 	// (4) L1StandardBridge

--- a/indexer/processors/bridge/l2_bridge_processor.go
+++ b/indexer/processors/bridge/l2_bridge_processor.go
@@ -72,11 +72,9 @@ func L2ProcessInitiatedBridgeEvents(log log.Logger, db *database.DB, metrics L2M
 		// extract the withdrawal hash from the previous MessagePassed event
 		messagePassed, ok := messagesPassed[logKey{sentMessage.Event.BlockHash, sentMessage.Event.LogIndex - 1}]
 		if !ok {
-			log.Error("expected MessagePassedEvent preceding SentMessage", "tx_hash", sentMessage.Event.TransactionHash.String())
-			return fmt.Errorf("expected MessagePassedEvent preceding SentMessage. tx_hash = %s", sentMessage.Event.TransactionHash.String())
+			return fmt.Errorf("expected MessagePassedEvent preceding SentMessage. tx_hash = %s", sentMessage.Event.TransactionHash)
 		} else if messagePassed.Event.TransactionHash != sentMessage.Event.TransactionHash {
-			log.Error("correlated events tx hash mismatch", "withdraw_tx_hash", messagePassed.Event.TransactionHash.String(), "message_tx_hash", sentMessage.Event.TransactionHash.String())
-			return fmt.Errorf("correlated events tx hash mismatch")
+			return fmt.Errorf("correlated events tx hash mismatch. message_tx_hash = %s, withdraw_tx_hash = %s", sentMessage.Event.TransactionHash, messagePassed.Event.TransactionHash)
 		}

 		bridgeMessages[i] = database.L2BridgeMessage{TransactionWithdrawalHash: messagePassed.WithdrawalHash, BridgeMessage: sentMessage.BridgeMessage}
@@ -105,20 +103,16 @@ func L2ProcessInitiatedBridgeEvents(log log.Logger, db *database.DB, metrics L2M
 		// extract the cross domain message hash & withdraw hash from the following events
 		messagePassed, ok := messagesPassed[logKey{initiatedBridge.Event.BlockHash, initiatedBridge.Event.LogIndex + 1}]
 		if !ok {
-			log.Error("expected MessagePassed following BridgeInitiated event", "tx_hash", initiatedBridge.Event.TransactionHash.String())
-			return fmt.Errorf("expected MessagePassed following BridgeInitiated event. tx_hash = %s", initiatedBridge.Event.TransactionHash.String())
+			return fmt.Errorf("expected MessagePassed following BridgeInitiated event. tx_hash = %s", initiatedBridge.Event.TransactionHash)
 		} else if messagePassed.Event.TransactionHash != initiatedBridge.Event.TransactionHash {
-			log.Error("correlated events tx hash mismatch", "withdraw_tx_hash", messagePassed.Event.TransactionHash.String(), "bridge_tx_hash", initiatedBridge.Event.TransactionHash.String())
-			return fmt.Errorf("correlated events tx hash mismatch")
+			return fmt.Errorf("correlated events tx hash mismatch. bridge_tx_hash = %s, withdraw_tx_hash = %s", initiatedBridge.Event.TransactionHash, messagePassed.Event.TransactionHash)
 		}

 		sentMessage, ok := sentMessages[logKey{initiatedBridge.Event.BlockHash, initiatedBridge.Event.LogIndex + 2}]
 		if !ok {
-			log.Error("expected SentMessage following BridgeInitiated event", "tx_hash", initiatedBridge.Event.TransactionHash.String())
-			return fmt.Errorf("expected SentMessage following BridgeInitiated event. tx_hash = %s", initiatedBridge.Event.TransactionHash.String())
+			return fmt.Errorf("expected SentMessage following BridgeInitiated event. tx_hash = %s", initiatedBridge.Event.TransactionHash)
 		} else if sentMessage.Event.TransactionHash != initiatedBridge.Event.TransactionHash {
-			log.Error("correlated events tx hash mismatch", "message_tx_hash", sentMessage.Event.TransactionHash.String(), "bridge_tx_hash", initiatedBridge.Event.TransactionHash.String())
-			return fmt.Errorf("correlated events tx hash mismatch")
+			return fmt.Errorf("correlated events tx hash mismatch. bridge_tx_hash = %s, message_tx_hash = %s", initiatedBridge.Event.TransactionHash, sentMessage.Event.TransactionHash)
 		}

 		bridgedTokens[initiatedBridge.BridgeTransfer.TokenPair.LocalTokenAddress]++
@@ -164,13 +158,11 @@ func L2ProcessFinalizedBridgeEvents(log log.Logger, db *database.DB, metrics L2M
 		if err != nil {
 			return err
 		} else if message == nil {
-			log.Error("missing indexed L1CrossDomainMessenger message", "tx_hash", relayed.Event.TransactionHash.String())
-			return fmt.Errorf("missing indexed L1CrossDomainMessager message. tx_hash = %s", relayed.Event.TransactionHash.String())
+			return fmt.Errorf("missing indexed L1CrossDomainMessager message! tx_hash = %s", relayed.Event.TransactionHash)
 		}

 		if err := db.BridgeMessages.MarkRelayedL1BridgeMessage(relayed.MessageHash, relayed.Event.GUID); err != nil {
-			log.Error("failed to relay cross domain message", "err", err, "tx_hash", relayed.Event.TransactionHash.String())
-			return err
+			return fmt.Errorf("failed to relay cross domain message. tx_hash = %s: %w", relayed.Event.TransactionHash, err)
 		}
 	}
 	if len(crossDomainRelayedMessages) > 0 {

--- a/indexer/processors/bridge/legacy_bridge_processor.go
+++ b/indexer/processors/bridge/legacy_bridge_processor.go
--- a/indexer/processors/bridge/legacy_bridge_processor_test.go
+++ b/indexer/processors/bridge/legacy_bridge_processor_test.go
+package bridge
+
+import (
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/indexer/bigint"
+	"github.com/ethereum-optimism/optimism/indexer/database"
+	"github.com/ethereum-optimism/optimism/indexer/processors/contracts"
+	"github.com/ethereum-optimism/optimism/op-bindings/bindings"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestLegacyWithdrawalAndMessageHash(t *testing.T) {
+	// Pre-Bedrock OP-Goerli withdrawal that was proven post-bedrock
+	// - L1 proven withdrawal tx: 0xa8853a3532f40052385602c66512e438bc1e3736d3cb7abde359f5b9377441c7
+	value := bigint.Zero
+	expectedWithdrawalHash := common.HexToHash("0xae99d25df3e38730f6ee6588733417e20a131923b84870be6aedb4f863b6302d")
+
+	// Ensure the L2 Tx which correlates with the above proven withdrawal results in the same computed withdrawal hash
+	//  - L2 withdrawal tx: 0x254d9c28add020404142f840ed794cea51f86c0f0a737e3e7bdd7e1e4550962e
+	abi, err := bindings.CrossDomainMessengerMetaData.GetAbi()
+	require.NoError(t, err)
+
+	var sentMessage bindings.CrossDomainMessengerSentMessage
+	sentMessageEvent := abi.Events["SentMessage"]
+	logData := common.FromHex("0x0000000000000000000000004200000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000186a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e4a9f9e67500000000000000000000000007865c6e87b9f70255377e024ace6630c1eaa37f0000000000000000000000003b8e53b3ab8e01fb57d0c9e893bc4d655aa67d84000000000000000000000000b91882244f7f82540f2941a759724523c7b9a166000000000000000000000000b91882244f7f82540f2941a759724523c7b9a166000000000000000000000000000000000000000000000000000000000000271000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
+	require.NoError(t, contracts.UnpackLog(&sentMessage, &types.Log{Data: logData, Topics: []common.Hash{sentMessageEvent.ID, common.HexToHash("0x000000000000000000000000636af16bf2f682dd3109e60102b8e1a089fedaa8")}}, sentMessageEvent.Name, abi))
+
+	// timestamp and message hash are filled in fields. not core to the event
+	msg := database.BridgeMessage{
+		Nonce:    sentMessage.MessageNonce,
+		GasLimit: sentMessage.GasLimit,
+		Tx:       database.Transaction{FromAddress: sentMessage.Sender, ToAddress: sentMessage.Target, Amount: value, Data: sentMessage.Message},
+	}
+
+	hash, err := legacyBridgeMessageWithdrawalHash(420, &msg)
+	require.NoError(t, err)
+	require.Equal(t, expectedWithdrawalHash, hash)
+
+	// Ensure the relayed message hash (v1) matches
+	expectedMessageHash := common.HexToHash("0xcb16ecc1967f5d7aed909349a4351d28fbb396429ef7faf1c9d2a670e3ca906f")
+	v1MessageHash, err := legacyBridgeMessageV1MessageHash(&msg)
+	require.NoError(t, err)
+	require.Equal(t, expectedMessageHash, v1MessageHash)
+}
--- a/indexer/processors/bridge/metrics.go
+++ b/indexer/processors/bridge/metrics.go
@@ -25,6 +25,10 @@ type L1Metricer interface {
 	RecordL1CrossDomainSentMessages(size int)
 	RecordL1CrossDomainRelayedMessages(size int)

+	RecordL1SkippedOVM1ProvenWithdrawals(size int)
+	RecordL1SkippedOVM1FinalizedWithdrawals(size int)
+	RecordL1SkippedOVM1CrossDomainRelayedMessages(size int)
+
 	RecordL1InitiatedBridgeTransfers(token common.Address, size int)
 	RecordL1FinalizedBridgeTransfers(token common.Address, size int)
 }
@@ -56,15 +60,19 @@ type bridgeMetrics struct {
 	intervalFailures *prometheus.CounterVec

 	txDeposits           prometheus.Counter
-	txMintedETH          prometheus.Counter
 	txWithdrawals        prometheus.Counter
-	txWithdrawnETH       prometheus.Counter
 	provenWithdrawals    prometheus.Counter
 	finalizedWithdrawals prometheus.Counter

+	txMintedETH    prometheus.Counter
+	txWithdrawnETH prometheus.Counter
+
 	sentMessages    *prometheus.CounterVec
 	relayedMessages *prometheus.CounterVec

+	skippedOVM1Withdrawals     *prometheus.CounterVec
+	skippedOVM1RelayedMessages prometheus.Counter
+
 	initiatedBridgeTransfers *prometheus.CounterVec
 	finalizedBridgeTransfers *prometheus.CounterVec
 }
@@ -95,7 +103,6 @@ func NewMetrics(registry *prometheus.Registry) Metricer {
 		}),
 		latestHeight: factory.NewGaugeVec(prometheus.GaugeOpts{
 			Namespace: MetricsNamespace,
-			Subsystem: "l1",
 			Name:      "height",
 			Help:      "the latest processed l1 block height",
 		}, []string{
@@ -115,7 +122,7 @@ func NewMetrics(registry *prometheus.Registry) Metricer {
 		txWithdrawals: factory.NewCounter(prometheus.CounterOpts{
 			Namespace: MetricsNamespace,
 			Name:      "tx_withdrawals",
-			Help:      "number of processed transactions withdrawn from l2",
+			Help:      "number of initiated transaction withdrawals from l2",
 		}),
 		txWithdrawnETH: factory.NewCounter(prometheus.CounterOpts{
 			Namespace: MetricsNamespace,
@@ -146,6 +153,18 @@ func NewMetrics(registry *prometheus.Registry) Metricer {
 		}, []string{
 			"chain",
 		}),
+		skippedOVM1Withdrawals: factory.NewCounterVec(prometheus.CounterOpts{
+			Namespace: MetricsNamespace,
+			Name:      "skipped_ovm1_withdrawals",
+			Help:      "number of skipped ovm 1.0 withdrawals on l1 (proven|finalized)",
+		}, []string{
+			"stage",
+		}),
+		skippedOVM1RelayedMessages: factory.NewCounter(prometheus.CounterOpts{
+			Namespace: MetricsNamespace,
+			Name:      "skipped_ovm1_relayed_messages",
+			Help:      "number of skipped ovm 1.0 relayed messages on l1",
+		}),
 		initiatedBridgeTransfers: factory.NewCounterVec(prometheus.CounterOpts{
 			Namespace: MetricsNamespace,
 			Name:      "initiated_token_transfers",
@@ -207,6 +226,18 @@ func (m *bridgeMetrics) RecordL1CrossDomainRelayedMessages(size int) {
 	m.relayedMessages.WithLabelValues("l1").Add(float64(size))
 }

+func (m *bridgeMetrics) RecordL1SkippedOVM1ProvenWithdrawals(size int) {
+	m.skippedOVM1Withdrawals.WithLabelValues("stage", "proven").Add(float64(size))
+}
+
+func (m *bridgeMetrics) RecordL1SkippedOVM1FinalizedWithdrawals(size int) {
+	m.skippedOVM1Withdrawals.WithLabelValues("stage", "finalized").Add(float64(size))
+}
+
+func (m *bridgeMetrics) RecordL1SkippedOVM1CrossDomainRelayedMessages(size int) {
+	m.skippedOVM1RelayedMessages.Add(float64(size))
+}
+
 func (m *bridgeMetrics) RecordL1InitiatedBridgeTransfers(tokenAddr common.Address, size int) {
 	m.initiatedBridgeTransfers.WithLabelValues("l1", tokenAddr.String()).Add(float64(size))
 }

--- a/indexer/processors/bridge/ovm1/OVM1Withdrawals.csv
+++ b/indexer/processors/bridge/ovm1/OVM1Withdrawals.csv
--- a/indexer/processors/bridge/ovm1/skipped_hashes.go
+++ b/indexer/processors/bridge/ovm1/skipped_hashes.go
--- a/indexer/processors/contracts/cross_domain_messenger.go
+++ b/indexer/processors/contracts/cross_domain_messenger.go
@@ -4,43 +4,18 @@ import (
 	"fmt"
 	"math/big"

-	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/crypto"

+	"github.com/ethereum-optimism/optimism/indexer/bigint"
 	"github.com/ethereum-optimism/optimism/indexer/database"
 	"github.com/ethereum-optimism/optimism/op-bindings/bindings"
-)
-
-var (
-	// Standard ABI types copied from golang ABI tests
-	uint256Type, _ = abi.NewType("uint256", "", nil)
-	bytesType, _   = abi.NewType("bytes", "", nil)
-	addressType, _ = abi.NewType("address", "", nil)
-
-	CrossDomainMessengerLegacyRelayMessageEncoding = abi.NewMethod(
-		"relayMessage",
-		"relayMessage",
-		abi.Function,
-		"external", // mutability
-		false,      // isConst
-		true,       // payable
-		abi.Arguments{ // inputs
-			{Name: "target", Type: addressType},
-			{Name: "sender", Type: addressType},
-			{Name: "data", Type: bytesType},
-			{Name: "nonce", Type: uint256Type},
-			// The actual transaction on the legacy L1CrossDomainMessenger has a trailing
-			// proof argument but is ignored for the `XDomainCallData` encoding
-		},
-		abi.Arguments{}, // outputs
-	)
+	"github.com/ethereum-optimism/optimism/op-chain-ops/crossdomain"
 )

 type CrossDomainMessengerSentMessageEvent struct {
-	Event           *database.ContractEvent
-	MessageCalldata []byte
-	BridgeMessage   database.BridgeMessage
+	Event         *database.ContractEvent
+	BridgeMessage database.BridgeMessage
+	Version       uint16
 }

 type CrossDomainMessengerRelayedMessageEvent struct {
@@ -85,32 +60,47 @@ func CrossDomainMessengerSentMessageEvents(chainSelector string, contractAddress
 			return nil, err
 		}

-		version, _ := DecodeVersionedNonce(sentMessage.MessageNonce)
+		_, versionBig := crossdomain.DecodeVersionedNonce(sentMessage.MessageNonce)
+		version := uint16(versionBig.Uint64())
 		if i < numVersionZeroMessages && version != 0 {
-			return nil, fmt.Errorf("expected version zero nonce. nonce %d tx_hash %s", sentMessage.MessageNonce, sentMessage.Raw.TxHash)
+			return nil, fmt.Errorf("expected version zero nonce: nonce %d, tx_hash %s", sentMessage.MessageNonce, sentMessage.Raw.TxHash)
 		}

-		// In version zero, to value is bridged through the cross domain messenger.
-		value := big.NewInt(0)
-		if version > 0 {
+		value := bigint.Zero
+		var messageHash common.Hash
+		switch version {
+		case 0:
+			messageHash, err = crossdomain.HashCrossDomainMessageV0(sentMessage.Target, sentMessage.Sender, sentMessage.Message, sentMessage.MessageNonce)
+			if err != nil {
+				return nil, err
+			}
+
+		case 1:
 			sentMessageExtension := bindings.CrossDomainMessengerSentMessageExtension1{Raw: *sentMessageExtensionEvents[i].RLPLog}
 			err = UnpackLog(&sentMessageExtension, sentMessageExtensionEvents[i].RLPLog, sentMessageExtensionEventAbi.Name, crossDomainMessengerAbi)
 			if err != nil {
 				return nil, err
 			}
+
 			value = sentMessageExtension.Value
-		}
+			messageHash, err = crossdomain.HashCrossDomainMessageV1(sentMessage.MessageNonce, sentMessage.Sender, sentMessage.Target, value, sentMessage.GasLimit, sentMessage.Message)
+			if err != nil {
+				return nil, err
+			}

-		messageCalldata, err := CrossDomainMessageCalldata(crossDomainMessengerAbi, &sentMessage, value)
-		if err != nil {
-			return nil, err
+		default:
+			// NOTE: We explicitly fail here since the presence of a new version means finalization
+			// logic needs to be updated to ensure L1 finalization can run from genesis and handle
+			// the changing version formats. Any unrelayed OVM1 messages that have been harcoded with
+			// the v1 hash format also need to be updated. This failure is a serving indicator
+			return nil, fmt.Errorf("expected cross domain version 0 or version 1: %d", version)
 		}

 		crossDomainSentMessages[i] = CrossDomainMessengerSentMessageEvent{
-			Event:           &sentMessageEvents[i],
-			MessageCalldata: messageCalldata,
+			Event:   &sentMessageEvents[i],
+			Version: version,
 			BridgeMessage: database.BridgeMessage{
-				MessageHash:          crypto.Keccak256Hash(messageCalldata),
+				MessageHash:          messageHash,
 				Nonce:                sentMessage.MessageNonce,
 				SentMessageEventGUID: sentMessageEvents[i].GUID,
 				GasLimit:             sentMessage.GasLimit,
@@ -157,26 +147,3 @@ func CrossDomainMessengerRelayedMessageEvents(chainSelector string, contractAddr

 	return crossDomainRelayedMessages, nil
 }
-
-// Replica of `Encoding.sol#encodeCrossDomainMessage` solidity implementation
-func CrossDomainMessageCalldata(abi *abi.ABI, sentMsg *bindings.CrossDomainMessengerSentMessage, value *big.Int) ([]byte, error) {
-	version, _ := DecodeVersionedNonce(sentMsg.MessageNonce)
-	switch version {
-	case 0:
-		// Legacy Message
-		inputBytes, err := CrossDomainMessengerLegacyRelayMessageEncoding.Inputs.Pack(sentMsg.Target, sentMsg.Sender, sentMsg.Message, sentMsg.MessageNonce)
-		if err != nil {
-			return nil, err
-		}
-		return append(CrossDomainMessengerLegacyRelayMessageEncoding.ID, inputBytes...), nil
-	case 1:
-		// Current Message
-		msgBytes, err := abi.Pack("relayMessage", sentMsg.MessageNonce, sentMsg.Sender, sentMsg.Target, value, sentMsg.GasLimit, sentMsg.Message)
-		if err != nil {
-			return nil, err
-		}
-		return msgBytes, nil
-	}
-
-	return nil, fmt.Errorf("unsupported cross domain messenger version: %d", version)
-}
--- a/indexer/processors/contracts/optimism_portal.go
+++ b/indexer/processors/contracts/optimism_portal.go
@@ -30,12 +30,6 @@ type OptimismPortalWithdrawalFinalizedEvent struct {
 	Event *database.ContractEvent
 }

-type OptimismPortalProvenWithdrawal struct {
-	OutputRoot    [32]byte
-	Timestamp     *big.Int
-	L2OutputIndex *big.Int
-}
-
 func OptimismPortalTransactionDepositEvents(contractAddress common.Address, db *database.DB, fromHeight, toHeight *big.Int) ([]OptimismPortalTransactionDepositEvent, error) {
 	optimismPortalAbi, err := bindings.OptimismPortalMetaData.GetAbi()
 	if err != nil {

--- a/indexer/processors/contracts/utils.go
+++ b/indexer/processors/contracts/utils.go
 package contracts

 import (
-	"encoding/binary"
 	"errors"
 	"fmt"
-	"math/big"

 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/core/types"
 )

-// DecodeVersionNonce is an re-implementation of Encoding.sol#decodeVersionedNonce.
-// If the nonce is greater than 32 bytes (solidity uint256), bytes [32:] are ignored
-func DecodeVersionedNonce(nonce *big.Int) (uint16, *big.Int) {
-	nonceBytes := nonce.Bytes()
-	nonceByteLen := len(nonceBytes)
-	if nonceByteLen < 30 {
-		// version is 0x0000
-		return 0, nonce
-	} else if nonceByteLen == 31 {
-		// version is 0x00[01..ff]
-		return uint16(nonceBytes[0]), new(big.Int).SetBytes(nonceBytes[1:])
-	} else {
-		// fully specified
-		version := binary.BigEndian.Uint16(nonceBytes[:2])
-		return version, new(big.Int).SetBytes(nonceBytes[2:])
-	}
-}
-
 func UnpackLog(out interface{}, log *types.Log, name string, contractAbi *abi.ABI) error {
 	eventAbi, ok := contractAbi.Events[name]
 	if !ok {

--- a/op-batcher/Dockerfile
+++ b/op-batcher/Dockerfile
-ARG OP_STACK_GO_BUILDER=us-docker.pkg.dev/oplabs-tools-artifacts/images/op-stack-go:latest
-FROM $OP_STACK_GO_BUILDER as builder
-# See "make golang-docker" and /ops/docker/op-stack-go
-
-FROM alpine:3.18
-
-COPY --from=builder /usr/local/bin/op-batcher /usr/local/bin/op-batcher
-
-CMD ["op-batcher"]
--- a/op-batcher/Dockerfile.dockerignore
+++ b/op-batcher/Dockerfile.dockerignore
-# ignore everything but the dockerfile, the op-stack-go base image performs the build
-*
--- a/op-batcher/batcher/driver.go
+++ b/op-batcher/batcher/driver.go
@@ -37,15 +37,15 @@ type RollupClient interface {

 // DriverSetup is the collection of input/output interfaces and configuration that the driver operates on.
 type DriverSetup struct {
-	Log          log.Logger
-	Metr         metrics.Metricer
-	RollupCfg    *rollup.Config
-	Cfg          BatcherConfig
-	Txmgr        txmgr.TxManager
-	L1Client     L1Client
-	L2Client     L2Client
-	RollupClient RollupClient
-	Channel      ChannelConfig
+	Log           log.Logger
+	Metr          metrics.Metricer
+	RollupConfig  *rollup.Config
+	Config        BatcherConfig
+	Txmgr         txmgr.TxManager
+	L1Client      L1Client
+	L2Client      L2Client
+	RollupClient  RollupClient
+	ChannelConfig ChannelConfig
 }

 // BatchSubmitter encapsulates a service responsible for submitting L2 tx
@@ -74,7 +74,7 @@ type BatchSubmitter struct {
 func NewBatchSubmitter(setup DriverSetup) *BatchSubmitter {
 	return &BatchSubmitter{
 		DriverSetup: setup,
-		state:       NewChannelManager(setup.Log, setup.Metr, setup.Channel, setup.RollupCfg),
+		state:       NewChannelManager(setup.Log, setup.Metr, setup.ChannelConfig, setup.RollupConfig),
 	}
 }

@@ -171,7 +171,7 @@ func (l *BatchSubmitter) loadBlocksIntoState(ctx context.Context) error {
 		latestBlock = block
 	}

-	l2ref, err := derive.L2BlockToBlockRef(latestBlock, &l.RollupCfg.Genesis)
+	l2ref, err := derive.L2BlockToBlockRef(latestBlock, &l.RollupConfig.Genesis)
 	if err != nil {
 		l.Log.Warn("Invalid L2 block loaded into state", "err", err)
 		return err
@@ -183,7 +183,7 @@ func (l *BatchSubmitter) loadBlocksIntoState(ctx context.Context) error {

 // loadBlockIntoState fetches & stores a single block into `state`. It returns the block it loaded.
 func (l *BatchSubmitter) loadBlockIntoState(ctx context.Context, blockNumber uint64) (*types.Block, error) {
-	ctx, cancel := context.WithTimeout(ctx, l.Cfg.NetworkTimeout)
+	ctx, cancel := context.WithTimeout(ctx, l.Config.NetworkTimeout)
 	defer cancel()
 	block, err := l.L2Client.BlockByNumber(ctx, new(big.Int).SetUint64(blockNumber))
 	if err != nil {
@@ -201,7 +201,7 @@ func (l *BatchSubmitter) loadBlockIntoState(ctx context.Context, blockNumber uin
 // calculateL2BlockRangeToStore determines the range (start,end] that should be loaded into the local state.
 // It also takes care of initializing some local state (i.e. will modify l.lastStoredBlock in certain conditions)
 func (l *BatchSubmitter) calculateL2BlockRangeToStore(ctx context.Context) (eth.BlockID, eth.BlockID, error) {
-	ctx, cancel := context.WithTimeout(ctx, l.Cfg.NetworkTimeout)
+	ctx, cancel := context.WithTimeout(ctx, l.Config.NetworkTimeout)
 	defer cancel()
 	syncStatus, err := l.RollupClient.SyncStatus(ctx)
 	// Ensure that we have the sync status
@@ -244,11 +244,11 @@ func (l *BatchSubmitter) calculateL2BlockRangeToStore(ctx context.Context) (eth.
 func (l *BatchSubmitter) loop() {
 	defer l.wg.Done()

-	ticker := time.NewTicker(l.Cfg.PollInterval)
+	ticker := time.NewTicker(l.Config.PollInterval)
 	defer ticker.Stop()

 	receiptsCh := make(chan txmgr.TxReceipt[txData])
-	queue := txmgr.NewQueue[txData](l.killCtx, l.Txmgr, l.Cfg.MaxPendingTransactions)
+	queue := txmgr.NewQueue[txData](l.killCtx, l.Txmgr, l.Config.MaxPendingTransactions)

 	for {
 		select {
@@ -347,7 +347,7 @@ func (l *BatchSubmitter) sendTransaction(txdata txData, queue *txmgr.Queue[txDat
 	}

 	candidate := txmgr.TxCandidate{
-		To:       &l.RollupCfg.BatchInboxAddress,
+		To:       &l.RollupConfig.BatchInboxAddress,
 		TxData:   data,
 		GasLimit: intrinsicGas,
 	}
@@ -387,7 +387,7 @@ func (l *BatchSubmitter) recordConfirmedTx(id txID, receipt *types.Receipt) {
 // l1Tip gets the current L1 tip as a L1BlockRef. The passed context is assumed
 // to be a lifetime context, so it is internally wrapped with a network timeout.
 func (l *BatchSubmitter) l1Tip(ctx context.Context) (eth.L1BlockRef, error) {
-	tctx, cancel := context.WithTimeout(ctx, l.Cfg.NetworkTimeout)
+	tctx, cancel := context.WithTimeout(ctx, l.Config.NetworkTimeout)
 	defer cancel()
 	head, err := l.L1Client.HeaderByNumber(tctx, nil)
 	if err != nil {

--- a/op-batcher/batcher/service.go
+++ b/op-batcher/batcher/service.go
@@ -48,7 +48,7 @@ type BatcherService struct {
 	RollupConfig *rollup.Config

 	// Channel builder parameters
-	Channel ChannelConfig
+	ChannelConfig ChannelConfig

 	driver *BatchSubmitter

@@ -90,7 +90,7 @@ func (bs *BatcherService) initFromCLIConfig(ctx context.Context, version string,
 	if err := bs.initRPCClients(ctx, cfg); err != nil {
 		return err
 	}
-	if err := bs.initRollupCfg(ctx); err != nil {
+	if err := bs.initRollupConfig(ctx); err != nil {
 		return fmt.Errorf("failed to load rollup config: %w", err)
 	}
 	if err := bs.initChannelConfig(cfg); err != nil {
@@ -153,12 +153,12 @@ func (bs *BatcherService) initBalanceMonitor(cfg *CLIConfig) {
 	}
 }

-func (bs *BatcherService) initRollupCfg(ctx context.Context) error {
-	rollupCfg, err := bs.RollupNode.RollupConfig(ctx)
+func (bs *BatcherService) initRollupConfig(ctx context.Context) error {
+	rollupConfig, err := bs.RollupNode.RollupConfig(ctx)
 	if err != nil {
 		return fmt.Errorf("failed to retrieve rollup config: %w", err)
 	}
-	bs.RollupConfig = rollupCfg
+	bs.RollupConfig = rollupConfig
 	if err := bs.RollupConfig.Check(); err != nil {
 		return fmt.Errorf("invalid rollup config: %w", err)
 	}
@@ -166,7 +166,7 @@ func (bs *BatcherService) initRollupCfg(ctx context.Context) error {
 }

 func (bs *BatcherService) initChannelConfig(cfg *CLIConfig) error {
-	bs.Channel = ChannelConfig{
+	bs.ChannelConfig = ChannelConfig{
 		SeqWindowSize:      bs.RollupConfig.SeqWindowSize,
 		ChannelTimeout:     bs.RollupConfig.ChannelTimeout,
 		MaxChannelDuration: cfg.MaxChannelDuration,
@@ -175,7 +175,7 @@ func (bs *BatcherService) initChannelConfig(cfg *CLIConfig) error {
 		CompressorConfig:   cfg.CompressorConfig.Config(),
 		BatchType:          cfg.BatchType,
 	}
-	if err := bs.Channel.Check(); err != nil {
+	if err := bs.ChannelConfig.Check(); err != nil {
 		return fmt.Errorf("invalid channel configuration: %w", err)
 	}
 	return nil
@@ -225,15 +225,15 @@ func (bs *BatcherService) initMetricsServer(cfg *CLIConfig) error {

 func (bs *BatcherService) initDriver() {
 	bs.driver = NewBatchSubmitter(DriverSetup{
-		Log:          bs.Log,
-		Metr:         bs.Metrics,
-		RollupCfg:    bs.RollupConfig,
-		Cfg:          bs.BatcherConfig,
-		Txmgr:        bs.TxManager,
-		L1Client:     bs.L1Client,
-		L2Client:     bs.L2Client,
-		RollupClient: bs.RollupNode,
-		Channel:      bs.Channel,
+		Log:           bs.Log,
+		Metr:          bs.Metrics,
+		RollupConfig:  bs.RollupConfig,
+		Config:        bs.BatcherConfig,
+		Txmgr:         bs.TxManager,
+		L1Client:      bs.L1Client,
+		L2Client:      bs.L2Client,
+		RollupClient:  bs.RollupNode,
+		ChannelConfig: bs.ChannelConfig,
 	})
 }

@@ -312,6 +312,10 @@ func (bs *BatcherService) Stop(ctx context.Context) error {
 			result = errors.Join(result, fmt.Errorf("failed to close balance metricer: %w", err))
 		}
 	}
+	if bs.TxManager != nil {
+		bs.TxManager.Close()
+	}
+
 	if bs.metricsSrv != nil {
 		if err := bs.metricsSrv.Stop(ctx); err != nil {
 			result = errors.Join(result, fmt.Errorf("failed to stop metrics server: %w", err))

--- a/op-bindings/artifacts.json
+++ b/op-bindings/artifacts.json
@@ -41,5 +41,6 @@
  "SafeProxyFactory",
  "DelayedVetoable",
  "ISemver",
-  "StorageSetter"
+  "StorageSetter",
+  "SuperchainConfig"
 ]
--- a/op-bindings/bindings/alphabetvm.go
+++ b/op-bindings/bindings/alphabetvm.go
--- a/op-bindings/bindings/alphabetvm_more.go
+++ b/op-bindings/bindings/alphabetvm_more.go
@@ -13,7 +13,7 @@ const AlphabetVMStorageLayoutJSON = "{\"storage\":[{\"astId\":1000,\"contract\":

 var AlphabetVMStorageLayout = new(solc.StorageLayout)

-var AlphabetVMDeployedBin = "0x608060405234801561001057600080fd5b50600436106100365760003560e01c80637dc0d1d01461003b578063836e7b3214610085575b600080fd5b60005461005b9073ffffffffffffffffffffffffffffffffffffffff1681565b60405173ffffffffffffffffffffffffffffffffffffffff90911681526020015b60405180910390f35b610098610093366004610213565b6100a6565b60405190815260200161007c565b600080600060087f0000000000000000000000000000000000000000000000000000000000000000901b600889896040516100e2929190610287565b6040518091039020901b03610108576000915061010187890189610297565b9050610127565b610114878901896102b0565b90925090508161012381610301565b9250505b81610133826001610339565b604080516020810193909352820152606001604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe081840301815291905280516020909101207effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f01000000000000000000000000000000000000000000000000000000000000001798975050505050505050565b60008083601f8401126101dc57600080fd5b50813567ffffffffffffffff8111156101f457600080fd5b60208301915083602082850101111561020c57600080fd5b9250929050565b60008060008060006060868803121561022b57600080fd5b853567ffffffffffffffff8082111561024357600080fd5b61024f89838a016101ca565b9097509550602088013591508082111561026857600080fd5b50610275888289016101ca565b96999598509660400135949350505050565b8183823760009101908152919050565b6000602082840312156102a957600080fd5b5035919050565b600080604083850312156102c357600080fd5b50508035926020909101359150565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8203610332576103326102d2565b5060010190565b6000821982111561034c5761034c6102d2565b50019056fea164736f6c634300080f000a"
+var AlphabetVMDeployedBin = "0x608060405234801561001057600080fd5b50600436106100365760003560e01c80637dc0d1d01461003b578063e14ced3214610085575b600080fd5b60005461005b9073ffffffffffffffffffffffffffffffffffffffff1681565b60405173ffffffffffffffffffffffffffffffffffffffff90911681526020015b60405180910390f35b610098610093366004610213565b6100a6565b60405190815260200161007c565b600080600060087f0000000000000000000000000000000000000000000000000000000000000000901b600889896040516100e2929190610287565b6040518091039020901b03610108576000915061010187890189610297565b9050610127565b610114878901896102b0565b90925090508161012381610301565b9250505b81610133826001610339565b604080516020810193909352820152606001604080517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe081840301815291905280516020909101207effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff167f01000000000000000000000000000000000000000000000000000000000000001798975050505050505050565b60008083601f8401126101dc57600080fd5b50813567ffffffffffffffff8111156101f457600080fd5b60208301915083602082850101111561020c57600080fd5b9250929050565b60008060008060006060868803121561022b57600080fd5b853567ffffffffffffffff8082111561024357600080fd5b61024f89838a016101ca565b9097509550602088013591508082111561026857600080fd5b50610275888289016101ca565b96999598509660400135949350505050565b8183823760009101908152919050565b6000602082840312156102a957600080fd5b5035919050565b600080604083850312156102c357600080fd5b50508035926020909101359150565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8203610332576103326102d2565b5060010190565b6000821982111561034c5761034c6102d2565b50019056fea164736f6c634300080f000a"

 func init() {
 	if err := json.Unmarshal([]byte(AlphabetVMStorageLayoutJSON), AlphabetVMStorageLayout); err != nil {

--- a/op-bindings/bindings/faultdisputegame.go
+++ b/op-bindings/bindings/faultdisputegame.go
--- a/op-bindings/bindings/faultdisputegame_more.go
+++ b/op-bindings/bindings/faultdisputegame_more.go
--- a/op-bindings/bindings/l1crossdomainmessenger.go
+++ b/op-bindings/bindings/l1crossdomainmessenger.go
--- a/op-bindings/bindings/l1crossdomainmessenger_more.go
+++ b/op-bindings/bindings/l1crossdomainmessenger_more.go
--- a/op-bindings/bindings/l1erc721bridge.go
+++ b/op-bindings/bindings/l1erc721bridge.go
--- a/op-bindings/bindings/l1erc721bridge_more.go
+++ b/op-bindings/bindings/l1erc721bridge_more.go
--- a/op-bindings/bindings/l1standardbridge.go
+++ b/op-bindings/bindings/l1standardbridge.go
--- a/op-bindings/bindings/l1standardbridge_more.go
+++ b/op-bindings/bindings/l1standardbridge_more.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/l2erc721bridge.go
+++ b/op-bindings/bindings/l2erc721bridge.go
--- a/op-bindings/bindings/l2erc721bridge_more.go
+++ b/op-bindings/bindings/l2erc721bridge_more.go
--- a/op-bindings/bindings/l2outputoracle.go
+++ b/op-bindings/bindings/l2outputoracle.go
--- a/op-bindings/bindings/l2outputoracle_more.go
+++ b/op-bindings/bindings/l2outputoracle_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/mips.go
+++ b/op-bindings/bindings/mips.go
--- a/op-bindings/bindings/mips_more.go
+++ b/op-bindings/bindings/mips_more.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.go
+++ b/op-bindings/bindings/optimismportal.go
--- a/op-bindings/bindings/optimismportal_more.go
+++ b/op-bindings/bindings/optimismportal_more.go
--- a/op-bindings/bindings/preimageoracle.go
+++ b/op-bindings/bindings/preimageoracle.go
--- a/op-bindings/bindings/preimageoracle_more.go
+++ b/op-bindings/bindings/preimageoracle_more.go
--- a/op-bindings/bindings/protocolversions.go
+++ b/op-bindings/bindings/protocolversions.go
--- a/op-bindings/bindings/protocolversions_more.go
+++ b/op-bindings/bindings/protocolversions_more.go
--- a/op-bindings/bindings/standardbridge.go
+++ b/op-bindings/bindings/standardbridge.go
--- a/op-bindings/bindings/standardbridge_more.go
+++ b/op-bindings/bindings/standardbridge_more.go
--- a/op-bindings/bindings/superchainconfig.go
+++ b/op-bindings/bindings/superchainconfig.go
--- a/op-bindings/bindings/superchainconfig_more.go
+++ b/op-bindings/bindings/superchainconfig_more.go
--- a/op-bindings/bindings/systemconfig.go
+++ b/op-bindings/bindings/systemconfig.go
--- a/op-bindings/bindings/systemconfig_more.go
+++ b/op-bindings/bindings/systemconfig_more.go
--- a/op-bindings/hardhat/types.go
+++ b/op-bindings/hardhat/types.go
--- a/op-bindings/predeploys/addresses.go
+++ b/op-bindings/predeploys/addresses.go
--- a/op-bindings/predeploys/predeploy.go
+++ b/op-bindings/predeploys/predeploy.go
+package predeploys
+
+import (
+	"github.com/ethereum/go-ethereum/common"
+)
+
+type DeployConfig interface {
+	GovernanceEnabled() bool
+	CanyonTime(genesisTime uint64) *uint64
+}
+
+type Predeploy struct {
+	Address       common.Address
+	ProxyDisabled bool
+	Enabled       func(config DeployConfig) bool
+}
--- a/op-chain-ops/cmd/check-l2/main.go
+++ b/op-chain-ops/cmd/check-l2/main.go
--- a/op-chain-ops/deployer/deployer.go
+++ b/op-chain-ops/deployer/deployer.go
@@ -32,6 +32,11 @@ type Constructor struct {
 	Args []interface{}
 }

+type SuperchainPredeploy struct {
+	Name     string
+	CodeHash common.Hash
+}
+
 type Deployment struct {
 	Name     string
 	Bytecode hexutil.Bytes
@@ -70,6 +75,8 @@ func NewBackendWithGenesisTimestamp(ts uint64, shanghai bool) *backends.Simulate
 		LondonBlock:         big.NewInt(0),
 		ArrowGlacierBlock:   big.NewInt(0),
 		GrayGlacierBlock:    big.NewInt(0),
+		ShanghaiTime:        nil,
+		CancunTime:          nil,
 		// Activated proof of stake. We manually build/commit blocks in the simulator anyway,
 		// and the timestamp verification of PoS is not against the wallclock,
 		// preventing blocks from getting stuck temporarily in the future-blocks queue, decreasing setup time a lot.

--- a/op-chain-ops/genesis/config.go
+++ b/op-chain-ops/genesis/config.go
--- a/op-chain-ops/genesis/genesis.go
+++ b/op-chain-ops/genesis/genesis.go
@@ -64,6 +64,7 @@ func NewL2Genesis(config *DeployConfig, block *types.Block) (*core.Genesis, erro
 		RegolithTime:                  config.RegolithTime(block.Time()),
 		CanyonTime:                    config.CanyonTime(block.Time()),
 		ShanghaiTime:                  config.CanyonTime(block.Time()),
+		CancunTime:                    nil, // no Dencun on L2 yet.
 		Optimism: &params.OptimismConfig{
 			EIP1559Denominator:       eip1559Denom,
 			EIP1559Elasticity:        eip1559Elasticity,
@@ -134,6 +135,8 @@ func NewL1Genesis(config *DeployConfig) (*core.Genesis, error) {
 		LondonBlock:         big.NewInt(0),
 		ArrowGlacierBlock:   big.NewInt(0),
 		GrayGlacierBlock:    big.NewInt(0),
+		ShanghaiTime:        nil,
+		CancunTime:          nil,
 	}

 	extraData := make([]byte, 0)
@@ -168,6 +171,10 @@ func NewL1Genesis(config *DeployConfig) (*core.Genesis, error) {
 	if timestamp == 0 {
 		timestamp = hexutil.Uint64(time.Now().Unix())
 	}
+	if !config.L1UseClique && config.L1CancunTimeOffset != nil {
+		cancunTime := uint64(timestamp) + *config.L1CancunTimeOffset
+		chainConfig.CancunTime = &cancunTime
+	}

 	return &core.Genesis{
 		Config:     &chainConfig,

--- a/op-chain-ops/genesis/helpers.go
+++ b/op-chain-ops/genesis/helpers.go
@@ -18,13 +18,13 @@ var (
 	codeNamespace = common.HexToAddress("0xc0D3C0d3C0d3C0D3c0d3C0d3c0D3C0d3c0d30000")
 	// l2PredeployNamespace represents the namespace of L2 predeploys
 	l2PredeployNamespace = common.HexToAddress("0x4200000000000000000000000000000000000000")
-	// bigL2PredeployNamespace represents the predeploy namespace as a big.Int
+	// BigL2PredeployNamespace represents the predeploy namespace as a big.Int
 	BigL2PredeployNamespace = new(big.Int).SetBytes(l2PredeployNamespace.Bytes())
 	// bigCodeNamespace represents the predeploy namespace as a big.Int
-	bigCodeNameSpace = new(big.Int).SetBytes(codeNamespace.Bytes())
-	// implementationSlot represents the EIP 1967 implementation storage slot
+	bigCodeNamespace = new(big.Int).SetBytes(codeNamespace.Bytes())
+	// ImplementationSlot represents the EIP 1967 implementation storage slot
 	ImplementationSlot = common.HexToHash("0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc")
-	// implementationSlot represents the EIP 1967 admin storage slot
+	// AdminSlot represents the EIP 1967 admin storage slot
 	AdminSlot = common.HexToHash("0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103")
 )

@@ -69,7 +69,7 @@ func AddressToCodeNamespace(addr common.Address) (common.Address, error) {
 		return common.Address{}, fmt.Errorf("cannot handle non predeploy: %s", addr)
 	}
 	bigAddress := new(big.Int).SetBytes(addr[18:])
-	num := new(big.Int).Or(bigCodeNameSpace, bigAddress)
+	num := new(big.Int).Or(bigCodeNamespace, bigAddress)
 	return common.BigToAddress(num), nil
 }


--- a/op-chain-ops/genesis/layer_two.go
+++ b/op-chain-ops/genesis/layer_two.go
--- a/op-chain-ops/genesis/layer_two_test.go
+++ b/op-chain-ops/genesis/layer_two_test.go
--- a/op-chain-ops/genesis/setters.go
+++ b/op-chain-ops/genesis/setters.go
@@ -55,8 +55,7 @@ func setProxies(db vm.StateDB, proxyAdminAddr common.Address, namespace *big.Int
 }

 // SetPrecompileBalances will set a single wei at each precompile address.
-// This is an optimization to make calling them cheaper. This should only
-// be used for devnets.
+// This is an optimization to make calling them cheaper.
 func SetPrecompileBalances(db vm.StateDB) {
 	for i := 0; i < PrecompileCount; i++ {
 		addr := common.BytesToAddress([]byte{byte(i)})

--- a/op-chain-ops/genesis/testdata/test-deploy-config-devnet-l1.json
+++ b/op-chain-ops/genesis/testdata/test-deploy-config-devnet-l1.json
@@ -41,5 +41,8 @@
  "enableGovernance": true,
  "governanceTokenSymbol": "OP",
  "governanceTokenName": "Optimism",
-  "governanceTokenOwner": "0x0000000000000000000000000000000000000333"
+  "governanceTokenOwner": "0x0000000000000000000000000000000000000333",
+
+  "l2GenesisRegolithTimeOffset": "0x0",
+  "l2GenesisCanyonTimeOffset": "0x0"
 }
--- a/op-chain-ops/immutables/immutables.go
+++ b/op-chain-ops/immutables/immutables.go
--- a/op-chain-ops/immutables/immutables_test.go
+++ b/op-chain-ops/immutables/immutables_test.go
@@ -65,6 +65,7 @@ func TestBuildOptimism(t *testing.T) {
 		"LegacyERC20ETH":                true,
 		"EAS":                           true,
 		"SchemaRegistry":                true,
+		"Create2Deployer":               true,
 	}

 	// Only the exact contracts that we care about are being

--- a/op-chain-ops/state/memory_db.go
+++ b/op-chain-ops/state/memory_db.go
@@ -61,6 +61,10 @@ func (db *MemoryStateDB) CreateAccount(addr common.Address) {
 	db.rw.Lock()
 	defer db.rw.Unlock()

+	db.createAccount(addr)
+}
+
+func (db *MemoryStateDB) createAccount(addr common.Address) {
 	if _, ok := db.genesis.Alloc[addr]; !ok {
 		db.genesis.Alloc[addr] = core.GenesisAccount{
 			Code:    []byte{},
@@ -69,7 +73,6 @@ func (db *MemoryStateDB) CreateAccount(addr common.Address) {
 			Nonce:   0,
 		}
 	}
-
 }

 func (db *MemoryStateDB) SubBalance(addr common.Address, amount *big.Int) {
@@ -165,6 +168,8 @@ func (db *MemoryStateDB) SetCode(addr common.Address, code []byte) {
 	db.rw.Lock()
 	defer db.rw.Unlock()

+	db.createAccount(addr)
+
 	account, ok := db.genesis.Alloc[addr]
 	if !ok {
 		return

--- a/op-chain-ops/upgrades/l1.go
+++ b/op-chain-ops/upgrades/l1.go
--- a/op-challenger/Dockerfile
+++ b/op-challenger/Dockerfile
-ARG OP_STACK_GO_BUILDER=us-docker.pkg.dev/oplabs-tools-artifacts/images/op-stack-go:latest
-FROM $OP_STACK_GO_BUILDER as builder
-# See "make golang-docker" and /ops/docker/op-stack-go
-
-FROM alpine:3.18
-
-# Make the bundled op-program the default cannon server
-COPY --from=builder /usr/local/bin/op-program /usr/local/bin/op-program
-ENV OP_CHALLENGER_CANNON_SERVER /usr/local/bin/op-program
-
-# Make the bundled cannon the default cannon executable
-COPY --from=builder /usr/local/bin/cannon /usr/local/bin/cannon
-ENV OP_CHALLENGER_CANNON_BIN /usr/local/bin/cannon
-
-COPY --from=builder /usr/local/bin/op-challenger /usr/local/bin/op-challenger
-
-CMD ["op-challenger"]
--- a/op-challenger/Dockerfile.dockerignore
+++ b/op-challenger/Dockerfile.dockerignore
-# ignore everything but the dockerfile, the op-stack-go base image performs the build
-*
--- a/op-challenger/challenger.go
+++ b/op-challenger/challenger.go
--- a/op-challenger/challenger_test.go
+++ b/op-challenger/challenger_test.go
--- a/op-challenger/cmd/main.go
+++ b/op-challenger/cmd/main.go
--- a/op-challenger/cmd/main_test.go
+++ b/op-challenger/cmd/main_test.go
--- a/op-challenger/config/config.go
+++ b/op-challenger/config/config.go
--- a/op-challenger/config/config_test.go
+++ b/op-challenger/config/config_test.go
--- a/op-challenger/game/fault/agent.go
+++ b/op-challenger/game/fault/agent.go
--- a/op-challenger/game/fault/agent_test.go
+++ b/op-challenger/game/fault/agent_test.go
@@ -115,8 +115,7 @@ func setupTestAgent(t *testing.T, agreeWithProposedOutput bool) (*Agent, *stubCl
 	depth := 4
 	provider := alphabet.NewTraceProvider("abcd", uint64(depth))
 	responder := &stubResponder{}
-	updater := &stubUpdater{}
-	agent := NewAgent(metrics.NoopMetrics, claimLoader, depth, trace.NewSimpleTraceAccessor(provider), responder, updater, agreeWithProposedOutput, logger)
+	agent := NewAgent(metrics.NoopMetrics, claimLoader, depth, trace.NewSimpleTraceAccessor(provider), responder, agreeWithProposedOutput, logger)
 	return agent, claimLoader, responder
 }

@@ -166,10 +165,3 @@ func (s *stubResponder) ResolveClaim(ctx context.Context, clainIdx uint64) error
 func (s *stubResponder) PerformAction(ctx context.Context, response types.Action) error {
 	return nil
 }
-
-type stubUpdater struct {
-}
-
-func (s *stubUpdater) UpdateOracle(ctx context.Context, data *types.PreimageOracleData) error {
-	panic("Not implemented")
-}
--- a/op-challenger/game/fault/contracts/faultdisputegame.go
+++ b/op-challenger/game/fault/contracts/faultdisputegame.go
--- a/op-challenger/game/fault/contracts/faultdisputegame_test.go
+++ b/op-challenger/game/fault/contracts/faultdisputegame_test.go
--- a/op-challenger/game/fault/contracts/gamefactory.go
+++ b/op-challenger/game/fault/contracts/gamefactory.go
--- a/op-challenger/game/fault/contracts/gamefactory_test.go
+++ b/op-challenger/game/fault/contracts/gamefactory_test.go
--- a/op-challenger/game/fault/contracts/oracle.go
+++ b/op-challenger/game/fault/contracts/oracle.go
--- a/op-challenger/game/fault/contracts/oracle_test.go
+++ b/op-challenger/game/fault/contracts/oracle_test.go
--- a/op-challenger/game/fault/contracts/vm.go
+++ b/op-challenger/game/fault/contracts/vm.go
--- a/op-challenger/game/fault/contracts/vm_test.go
+++ b/op-challenger/game/fault/contracts/vm_test.go
--- a/op-challenger/game/fault/player.go
+++ b/op-challenger/game/fault/player.go
--- a/op-challenger/game/fault/register.go
+++ b/op-challenger/game/fault/register.go
--- a/op-challenger/game/fault/responder/responder.go
+++ b/op-challenger/game/fault/responder/responder.go
--- a/op-challenger/game/fault/responder/responder_test.go
+++ b/op-challenger/game/fault/responder/responder_test.go
--- a/op-challenger/game/fault/test/alphabet.go
+++ b/op-challenger/game/fault/test/alphabet.go
--- a/op-challenger/game/fault/test/game_builder.go
+++ b/op-challenger/game/fault/test/game_builder.go
--- a/op-challenger/game/fault/trace/access.go
+++ b/op-challenger/game/fault/trace/access.go
--- a/op-challenger/game/fault/trace/alphabet/provider.go
+++ b/op-challenger/game/fault/trace/alphabet/provider.go
--- a/op-challenger/game/fault/trace/alphabet/provider_test.go
+++ b/op-challenger/game/fault/trace/alphabet/provider_test.go
--- a/op-challenger/game/fault/trace/alphabet/updater.go
+++ b/op-challenger/game/fault/trace/alphabet/updater.go
--- a/op-challenger/game/fault/trace/alphabet/updater_test.go
+++ b/op-challenger/game/fault/trace/alphabet/updater_test.go
--- a/op-challenger/game/fault/trace/cannon/local.go
+++ b/op-challenger/game/fault/trace/cannon/local.go
--- a/op-challenger/game/fault/trace/cannon/local_test.go
+++ b/op-challenger/game/fault/trace/cannon/local_test.go
--- a/op-challenger/game/fault/trace/cannon/provider.go
+++ b/op-challenger/game/fault/trace/cannon/provider.go
--- a/op-challenger/game/fault/trace/cannon/provider_test.go
+++ b/op-challenger/game/fault/trace/cannon/provider_test.go
--- a/op-challenger/game/fault/trace/cannon/updater.go
+++ b/op-challenger/game/fault/trace/cannon/updater.go
--- a/op-challenger/game/fault/trace/cannon/updater_test.go
+++ b/op-challenger/game/fault/trace/cannon/updater_test.go
--- a/op-challenger/game/fault/trace/outputs/output_cannon.go
+++ b/op-challenger/game/fault/trace/outputs/output_cannon.go
--- a/op-challenger/game/fault/trace/outputs/provider.go
+++ b/op-challenger/game/fault/trace/outputs/provider.go
--- a/op-challenger/game/fault/trace/outputs/provider_cache.go
+++ b/op-challenger/game/fault/trace/outputs/provider_cache.go
--- a/op-challenger/game/fault/trace/outputs/provider_cache_test.go
+++ b/op-challenger/game/fault/trace/outputs/provider_cache_test.go
--- a/op-challenger/game/fault/trace/outputs/provider_test.go
+++ b/op-challenger/game/fault/trace/outputs/provider_test.go
--- a/op-challenger/game/fault/trace/outputs/split_adapter.go
+++ b/op-challenger/game/fault/trace/outputs/split_adapter.go
--- a/op-challenger/game/fault/trace/outputs/split_adapter_test.go
+++ b/op-challenger/game/fault/trace/outputs/split_adapter_test.go
--- a/op-challenger/game/fault/trace/split/provider.go
+++ b/op-challenger/game/fault/trace/split/provider.go
--- a/op-challenger/game/fault/trace/split/provider_test.go
+++ b/op-challenger/game/fault/trace/split/provider_test.go
--- a/op-challenger/game/fault/trace/split/split.go
+++ b/op-challenger/game/fault/trace/split/split.go
--- a/op-challenger/game/fault/trace/split/split_test.go
+++ b/op-challenger/game/fault/trace/split/split_test.go
--- a/op-challenger/game/fault/trace/translate.go
+++ b/op-challenger/game/fault/trace/translate.go
--- a/op-challenger/game/fault/types/position.go
+++ b/op-challenger/game/fault/types/position.go
--- a/op-challenger/game/fault/types/types.go
+++ b/op-challenger/game/fault/types/types.go
--- a/op-challenger/game/fault/types/types_test.go
+++ b/op-challenger/game/fault/types/types_test.go
--- a/op-challenger/game/loader/game_loader.go
+++ b/op-challenger/game/loader/game_loader.go
--- a/op-challenger/game/loader/game_loader_test.go
+++ b/op-challenger/game/loader/game_loader_test.go
--- a/op-challenger/game/monitor.go
+++ b/op-challenger/game/monitor.go
--- a/op-challenger/game/monitor_test.go
+++ b/op-challenger/game/monitor_test.go
--- a/op-challenger/game/scheduler/coordinator.go
+++ b/op-challenger/game/scheduler/coordinator.go
--- a/op-challenger/game/service.go
+++ b/op-challenger/game/service.go
--- a/op-challenger/metrics/metrics.go
+++ b/op-challenger/metrics/metrics.go
--- a/op-challenger/metrics/noop.go
+++ b/op-challenger/metrics/noop.go
--- a/op-challenger/scripts/alphabet/init_game.sh
+++ b/op-challenger/scripts/alphabet/init_game.sh
--- a/op-challenger/scripts/create_game.sh
+++ b/op-challenger/scripts/create_game.sh
--- a/op-e2e/actions/dencun_fork_test.go
+++ b/op-e2e/actions/dencun_fork_test.go
--- a/op-e2e/actions/l1_replica.go
+++ b/op-e2e/actions/l1_replica.go
--- a/op-e2e/actions/l2_proposer.go
+++ b/op-e2e/actions/l2_proposer.go
--- a/op-e2e/bridge_test.go
+++ b/op-e2e/bridge_test.go
--- a/op-e2e/deposit_test.go
+++ b/op-e2e/deposit_test.go
--- a/op-e2e/e2eutils/challenger/helper.go
+++ b/op-e2e/e2eutils/challenger/helper.go
--- a/op-e2e/e2eutils/disputegame/cannon_helper.go
+++ b/op-e2e/e2eutils/disputegame/cannon_helper.go
--- a/op-e2e/e2eutils/disputegame/helper.go
+++ b/op-e2e/e2eutils/disputegame/helper.go
--- a/op-e2e/e2eutils/disputegame/output_cannon_helper.go
+++ b/op-e2e/e2eutils/disputegame/output_cannon_helper.go
--- a/op-e2e/e2eutils/fakebeacon/blobs.go
+++ b/op-e2e/e2eutils/fakebeacon/blobs.go
--- a/op-e2e/e2eutils/geth/fakepos.go
+++ b/op-e2e/e2eutils/geth/fakepos.go
--- a/op-e2e/e2eutils/geth/geth.go
+++ b/op-e2e/e2eutils/geth/geth.go
--- a/op-e2e/e2eutils/geth/wait.go
+++ b/op-e2e/e2eutils/geth/wait.go
--- a/op-e2e/external.go
+++ b/op-e2e/external.go
--- a/op-e2e/faultproofs/alphabet_test.go
+++ b/op-e2e/faultproofs/alphabet_test.go
--- a/op-e2e/faultproof_test.go
+++ b/op-e2e/faultproof_test.go
--- a/op-e2e/faultproofs/multi_test.go
+++ b/op-e2e/faultproofs/multi_test.go
--- a/op-e2e/faultproofs/output_cannon_test.go
+++ b/op-e2e/faultproofs/output_cannon_test.go
--- a/op-e2e/faultproofs/util.go
+++ b/op-e2e/faultproofs/util.go
--- a/op-e2e/op_geth_test.go
+++ b/op-e2e/op_geth_test.go
--- a/op-e2e/setup.go
+++ b/op-e2e/setup.go
--- a/op-e2e/system_fpp_test.go
+++ b/op-e2e/system_fpp_test.go
--- a/op-e2e/system_test.go
+++ b/op-e2e/system_test.go
--- a/op-e2e/system_tob_test.go
+++ b/op-e2e/system_tob_test.go
--- a/op-e2e/tx_helper.go
+++ b/op-e2e/tx_helper.go
--- a/op-heartbeat/Dockerfile
+++ b/op-heartbeat/Dockerfile
--- a/op-heartbeat/Dockerfile.dockerignore
+++ b/op-heartbeat/Dockerfile.dockerignore
--- a/op-node/Dockerfile
+++ b/op-node/Dockerfile
--- a/op-node/Dockerfile.dockerignore
+++ b/op-node/Dockerfile.dockerignore
--- a/op-node/cmd/genesis/cmd.go
+++ b/op-node/cmd/genesis/cmd.go
--- a/op-node/node/node.go
+++ b/op-node/node/node.go
--- a/op-node/p2p/store/records_book.go
+++ b/op-node/p2p/store/records_book.go
--- a/op-node/rollup/driver/driver.go
+++ b/op-node/rollup/driver/driver.go
--- a/op-node/rollup/driver/state.go
+++ b/op-node/rollup/driver/state.go
--- a/op-program/Dockerfile
+++ b/op-program/Dockerfile
--- a/op-program/Dockerfile.dockerignore
+++ b/op-program/Dockerfile.dockerignore
--- a/op-program/client/mpt/trie.go
+++ b/op-program/client/mpt/trie.go
--- a/op-proposer/Dockerfile
+++ b/op-proposer/Dockerfile
--- a/op-proposer/Dockerfile.dockerignore
+++ b/op-proposer/Dockerfile.dockerignore
--- a/op-proposer/cmd/main.go
+++ b/op-proposer/cmd/main.go
--- a/op-proposer/metrics/metrics.go
+++ b/op-proposer/metrics/metrics.go
--- a/op-proposer/metrics/noop.go
+++ b/op-proposer/metrics/noop.go
--- a/op-proposer/proposer/abi_test.go
+++ b/op-proposer/proposer/abi_test.go
--- a/op-proposer/proposer/config.go
+++ b/op-proposer/proposer/config.go
--- a/op-proposer/proposer/driver.go
+++ b/op-proposer/proposer/driver.go
--- a/op-proposer/proposer/l2_output_submitter.go
+++ b/op-proposer/proposer/l2_output_submitter.go
--- a/op-proposer/proposer/rpc/api.go
+++ b/op-proposer/proposer/rpc/api.go
--- a/op-proposer/proposer/service.go
+++ b/op-proposer/proposer/service.go
--- a/op-service/cliapp/lifecycle_test.go
+++ b/op-service/cliapp/lifecycle_test.go
--- a/op-service/eth/blob.go
+++ b/op-service/eth/blob.go
--- a/op-service/eth/blobs_api.go
+++ b/op-service/eth/blobs_api.go
--- a/op-service/eth/heads.go
+++ b/op-service/eth/heads.go
--- a/op-service/eth/id.go
+++ b/op-service/eth/id.go
--- a/op-service/eth/types.go
+++ b/op-service/eth/types.go
--- a/op-service/ioutil/atomic.go
+++ b/op-service/ioutil/atomic.go
--- a/op-service/ioutil/atomic_test.go
+++ b/op-service/ioutil/atomic_test.go
--- a/op-service/ioutil/gzip.go
+++ b/op-service/ioutil/gzip.go
--- a/op-service/rethdb-reader/.gitignore
+++ b/op-service/rethdb-reader/.gitignore
--- a/op-service/rethdb-reader/Cargo.lock
+++ b/op-service/rethdb-reader/Cargo.lock
--- a/op-service/rethdb-reader/Cargo.toml
+++ b/op-service/rethdb-reader/Cargo.toml
--- a/op-service/rethdb-reader/Makefile
+++ b/op-service/rethdb-reader/Makefile
--- a/op-service/rethdb-reader/README.md
+++ b/op-service/rethdb-reader/README.md
--- a/op-service/rethdb-reader/rustfmt.toml
+++ b/op-service/rethdb-reader/rustfmt.toml
--- a/op-service/rethdb-reader/src/lib.rs
+++ b/op-service/rethdb-reader/src/lib.rs
--- a/op-service/rethdb-reader/src/receipts.rs
+++ b/op-service/rethdb-reader/src/receipts.rs
--- a/op-service/rethdb-reader/testdata/block.rlp
+++ b/op-service/rethdb-reader/testdata/block.rlp
--- a/op-service/rethdb-reader/testdata/receipts.json
+++ b/op-service/rethdb-reader/testdata/receipts.json
--- a/op-service/sources/batching/test/stubs.go
+++ b/op-service/sources/batching/test/stubs.go
--- a/op-service/sources/reth_db_test.go
+++ b/op-service/sources/reth_db_test.go
--- a/op-service/sources/types.go
+++ b/op-service/sources/types.go
--- a/op-service/txmgr/mocks/TxManager.go
+++ b/op-service/txmgr/mocks/TxManager.go
--- a/op-service/txmgr/txmgr.go
+++ b/op-service/txmgr/txmgr.go
--- a/op-service/txmgr/txmgr_test.go
+++ b/op-service/txmgr/txmgr_test.go
--- a/op-wheel/Dockerfile
+++ b/op-wheel/Dockerfile
--- a/op-wheel/Dockerfile.dockerignore
+++ b/op-wheel/Dockerfile.dockerignore
--- a/ops-bedrock/Dockerfile.l1
+++ b/ops-bedrock/Dockerfile.l1
--- a/ops-bedrock/docker-compose.yml
+++ b/ops-bedrock/docker-compose.yml
--- a/ops/docker/Dockerfile.packages
+++ b/ops/docker/Dockerfile.packages
--- a/ops/docker/ci-builder/Dockerfile
+++ b/ops/docker/ci-builder/Dockerfile
--- a/ops/docker/ci-builder/Dockerfile.dockerignore
+++ b/ops/docker/ci-builder/Dockerfile.dockerignore
--- a/ops/docker/op-stack-go/Dockerfile
+++ b/ops/docker/op-stack-go/Dockerfile
--- a/ops/docker/oplabs.crt
+++ b/ops/docker/oplabs.crt
--- a/ops/scripts/install-foundry.sh
+++ b/ops/scripts/install-foundry.sh
--- a/package.json
+++ b/package.json
--- a/packages/chain-mon/CHANGELOG.md
+++ b/packages/chain-mon/CHANGELOG.md
--- a/packages/chain-mon/package.json
+++ b/packages/chain-mon/package.json
--- a/packages/chain-mon/src/fault-mon/service.ts
+++ b/packages/chain-mon/src/fault-mon/service.ts
--- a/packages/chain-mon/test/fault-mon/helpers.spec.ts
+++ b/packages/chain-mon/test/fault-mon/helpers.spec.ts
--- a/packages/common-ts/package.json
+++ b/packages/common-ts/package.json
--- a/packages/contracts-bedrock/.gas-snapshot
+++ b/packages/contracts-bedrock/.gas-snapshot
--- a/packages/contracts-bedrock/.gitignore
+++ b/packages/contracts-bedrock/.gitignore
--- a/packages/contracts-bedrock/.storage-layout
+++ b/packages/contracts-bedrock/.storage-layout
--- a/packages/contracts-bedrock/CONTRIBUTING.md
+++ b/packages/contracts-bedrock/CONTRIBUTING.md
--- a/packages/contracts-bedrock/STYLE_GUIDE.md
+++ b/packages/contracts-bedrock/STYLE_GUIDE.md
--- a/packages/contracts-bedrock/invariant-docs/SystemConfig.md
+++ b/packages/contracts-bedrock/invariant-docs/SystemConfig.md
--- a/packages/contracts-bedrock/layout-lock.json
+++ b/packages/contracts-bedrock/layout-lock.json
--- a/forge-std @ 2f112697
+++ b/forge-std @ 2f112697
--- a/packages/contracts-bedrock/package.json
+++ b/packages/contracts-bedrock/package.json
--- a/packages/contracts-bedrock/scripts/ChainAssertions.sol
+++ b/packages/contracts-bedrock/scripts/ChainAssertions.sol
--- a/packages/contracts-bedrock/scripts/Deploy.s.sol
+++ b/packages/contracts-bedrock/scripts/Deploy.s.sol
--- a/packages/contracts-bedrock/scripts/Deployer.sol
+++ b/packages/contracts-bedrock/scripts/Deployer.sol
--- a/packages/contracts-bedrock/scripts/Executables.sol
+++ b/packages/contracts-bedrock/scripts/Executables.sol
--- a/packages/contracts-bedrock/scripts/Types.sol
+++ b/packages/contracts-bedrock/scripts/Types.sol
--- a/packages/contracts-bedrock/scripts/deploy.sh
+++ b/packages/contracts-bedrock/scripts/deploy.sh
--- a/packages/contracts-bedrock/scripts/generate-l2-genesis.sh
+++ b/packages/contracts-bedrock/scripts/generate-l2-genesis.sh
--- a/packages/contracts-bedrock/scripts/generate-snapshots.ts
+++ b/packages/contracts-bedrock/scripts/generate-snapshots.ts
--- a/packages/contracts-bedrock/scripts/validate-spacers.ts
+++ b/packages/contracts-bedrock/scripts/validate-spacers.ts
--- a/packages/contracts-bedrock/semver-lock.json
+++ b/packages/contracts-bedrock/semver-lock.json
--- a/packages/contracts-bedrock/snapshots/abi/AddressManager.json
+++ b/packages/contracts-bedrock/snapshots/abi/AddressManager.json
--- a/packages/contracts-bedrock/snapshots/abi/AdminFaucetAuthModule.json
+++ b/packages/contracts-bedrock/snapshots/abi/AdminFaucetAuthModule.json
--- a/packages/contracts-bedrock/snapshots/abi/AssetReceiver.json
+++ b/packages/contracts-bedrock/snapshots/abi/AssetReceiver.json
--- a/packages/contracts-bedrock/snapshots/abi/AttestationStation.json
+++ b/packages/contracts-bedrock/snapshots/abi/AttestationStation.json
--- a/packages/contracts-bedrock/snapshots/abi/BaseFeeVault.json
+++ b/packages/contracts-bedrock/snapshots/abi/BaseFeeVault.json
--- a/packages/contracts-bedrock/snapshots/abi/BlockOracle.json
+++ b/packages/contracts-bedrock/snapshots/abi/BlockOracle.json
--- a/packages/contracts-bedrock/snapshots/abi/CheckBalanceLow.json
+++ b/packages/contracts-bedrock/snapshots/abi/CheckBalanceLow.json
--- a/packages/contracts-bedrock/snapshots/abi/CheckGelatoLow.json
+++ b/packages/contracts-bedrock/snapshots/abi/CheckGelatoLow.json
--- a/packages/contracts-bedrock/snapshots/abi/CheckTrue.json
+++ b/packages/contracts-bedrock/snapshots/abi/CheckTrue.json
--- a/packages/contracts-bedrock/snapshots/abi/Clone.json
+++ b/packages/contracts-bedrock/snapshots/abi/Clone.json
--- a/packages/contracts-bedrock/snapshots/abi/DelayedVetoable.json
+++ b/packages/contracts-bedrock/snapshots/abi/DelayedVetoable.json
--- a/packages/contracts-bedrock/snapshots/abi/DeployerWhitelist.json
+++ b/packages/contracts-bedrock/snapshots/abi/DeployerWhitelist.json
--- a/packages/contracts-bedrock/snapshots/abi/DisputeGameFactory.json
+++ b/packages/contracts-bedrock/snapshots/abi/DisputeGameFactory.json
--- a/packages/contracts-bedrock/snapshots/abi/Drippie.json
+++ b/packages/contracts-bedrock/snapshots/abi/Drippie.json
--- a/packages/contracts-bedrock/snapshots/abi/EAS.json
+++ b/packages/contracts-bedrock/snapshots/abi/EAS.json
--- a/packages/contracts-bedrock/snapshots/abi/Faucet.json
+++ b/packages/contracts-bedrock/snapshots/abi/Faucet.json
--- a/packages/contracts-bedrock/snapshots/abi/FaultDisputeGame.json
+++ b/packages/contracts-bedrock/snapshots/abi/FaultDisputeGame.json
--- a/packages/contracts-bedrock/snapshots/abi/GasPriceOracle.json
+++ b/packages/contracts-bedrock/snapshots/abi/GasPriceOracle.json
--- a/packages/contracts-bedrock/snapshots/abi/GovernanceToken.json
+++ b/packages/contracts-bedrock/snapshots/abi/GovernanceToken.json
--- a/packages/contracts-bedrock/snapshots/abi/L1Block.json
+++ b/packages/contracts-bedrock/snapshots/abi/L1Block.json
--- a/packages/contracts-bedrock/snapshots/abi/L1BlockNumber.json
+++ b/packages/contracts-bedrock/snapshots/abi/L1BlockNumber.json
--- a/packages/contracts-bedrock/snapshots/abi/L1ChugSplashProxy.json
+++ b/packages/contracts-bedrock/snapshots/abi/L1ChugSplashProxy.json
--- a/packages/contracts-bedrock/snapshots/abi/L1CrossDomainMessenger.json
+++ b/packages/contracts-bedrock/snapshots/abi/L1CrossDomainMessenger.json
--- a/packages/contracts-bedrock/snapshots/abi/L1ERC721Bridge.json
+++ b/packages/contracts-bedrock/snapshots/abi/L1ERC721Bridge.json
--- a/packages/contracts-bedrock/snapshots/abi/L1FeeVault.json
+++ b/packages/contracts-bedrock/snapshots/abi/L1FeeVault.json
--- a/packages/contracts-bedrock/snapshots/abi/L1StandardBridge.json
+++ b/packages/contracts-bedrock/snapshots/abi/L1StandardBridge.json
--- a/packages/contracts-bedrock/snapshots/abi/L2CrossDomainMessenger.json
+++ b/packages/contracts-bedrock/snapshots/abi/L2CrossDomainMessenger.json
--- a/packages/contracts-bedrock/snapshots/abi/L2ERC721Bridge.json
+++ b/packages/contracts-bedrock/snapshots/abi/L2ERC721Bridge.json
--- a/packages/contracts-bedrock/snapshots/abi/L2OutputOracle.json
+++ b/packages/contracts-bedrock/snapshots/abi/L2OutputOracle.json
--- a/packages/contracts-bedrock/snapshots/abi/L2StandardBridge.json
+++ b/packages/contracts-bedrock/snapshots/abi/L2StandardBridge.json
--- a/packages/contracts-bedrock/snapshots/abi/L2ToL1MessagePasser.json
+++ b/packages/contracts-bedrock/snapshots/abi/L2ToL1MessagePasser.json
--- a/packages/contracts-bedrock/snapshots/abi/LegacyERC20ETH.json
+++ b/packages/contracts-bedrock/snapshots/abi/LegacyERC20ETH.json
--- a/packages/contracts-bedrock/snapshots/abi/LegacyMessagePasser.json
+++ b/packages/contracts-bedrock/snapshots/abi/LegacyMessagePasser.json
--- a/packages/contracts-bedrock/snapshots/abi/LegacyMintableERC20.json
+++ b/packages/contracts-bedrock/snapshots/abi/LegacyMintableERC20.json
--- a/packages/contracts-bedrock/snapshots/abi/LivenessGuard.json
+++ b/packages/contracts-bedrock/snapshots/abi/LivenessGuard.json
--- a/packages/contracts-bedrock/snapshots/abi/LivenessModule.json
+++ b/packages/contracts-bedrock/snapshots/abi/LivenessModule.json
--- a/packages/contracts-bedrock/snapshots/abi/MIPS.json
+++ b/packages/contracts-bedrock/snapshots/abi/MIPS.json
--- a/packages/contracts-bedrock/snapshots/abi/MintManager.json
+++ b/packages/contracts-bedrock/snapshots/abi/MintManager.json
--- a/packages/contracts-bedrock/snapshots/abi/OptimismMintableERC20.json
+++ b/packages/contracts-bedrock/snapshots/abi/OptimismMintableERC20.json
--- a/packages/contracts-bedrock/snapshots/abi/OptimismMintableERC20Factory.json
+++ b/packages/contracts-bedrock/snapshots/abi/OptimismMintableERC20Factory.json
--- a/packages/contracts-bedrock/snapshots/abi/OptimismMintableERC721.json
+++ b/packages/contracts-bedrock/snapshots/abi/OptimismMintableERC721.json
--- a/packages/contracts-bedrock/snapshots/abi/OptimismMintableERC721Factory.json
+++ b/packages/contracts-bedrock/snapshots/abi/OptimismMintableERC721Factory.json
--- a/packages/contracts-bedrock/snapshots/abi/OptimismPortal.json
+++ b/packages/contracts-bedrock/snapshots/abi/OptimismPortal.json
--- a/packages/contracts-bedrock/snapshots/abi/Optimist.json
+++ b/packages/contracts-bedrock/snapshots/abi/Optimist.json
--- a/packages/contracts-bedrock/snapshots/abi/OptimistAllowlist.json
+++ b/packages/contracts-bedrock/snapshots/abi/OptimistAllowlist.json
--- a/packages/contracts-bedrock/snapshots/abi/OptimistInviter.json
+++ b/packages/contracts-bedrock/snapshots/abi/OptimistInviter.json
--- a/packages/contracts-bedrock/snapshots/abi/PreimageOracle.json
+++ b/packages/contracts-bedrock/snapshots/abi/PreimageOracle.json
--- a/packages/contracts-bedrock/snapshots/abi/ProtocolVersions.json
+++ b/packages/contracts-bedrock/snapshots/abi/ProtocolVersions.json
--- a/packages/contracts-bedrock/snapshots/abi/Proxy.json
+++ b/packages/contracts-bedrock/snapshots/abi/Proxy.json
--- a/packages/contracts-bedrock/snapshots/abi/ProxyAdmin.json
+++ b/packages/contracts-bedrock/snapshots/abi/ProxyAdmin.json
--- a/packages/contracts-bedrock/snapshots/abi/ResolvedDelegateProxy.json
+++ b/packages/contracts-bedrock/snapshots/abi/ResolvedDelegateProxy.json
--- a/packages/contracts-bedrock/snapshots/abi/SchemaRegistry.json
+++ b/packages/contracts-bedrock/snapshots/abi/SchemaRegistry.json
--- a/packages/contracts-bedrock/snapshots/abi/SequencerFeeVault.json
+++ b/packages/contracts-bedrock/snapshots/abi/SequencerFeeVault.json
--- a/packages/contracts-bedrock/snapshots/abi/StorageSetter.json
+++ b/packages/contracts-bedrock/snapshots/abi/StorageSetter.json
--- a/packages/contracts-bedrock/snapshots/abi/SuperchainConfig.json
+++ b/packages/contracts-bedrock/snapshots/abi/SuperchainConfig.json
--- a/packages/contracts-bedrock/snapshots/abi/SystemConfig.json
+++ b/packages/contracts-bedrock/snapshots/abi/SystemConfig.json
--- a/packages/contracts-bedrock/snapshots/abi/Transactor.json
+++ b/packages/contracts-bedrock/snapshots/abi/Transactor.json
--- a/packages/contracts-bedrock/snapshots/abi/TransferOnion.json
+++ b/packages/contracts-bedrock/snapshots/abi/TransferOnion.json
--- a/packages/contracts-bedrock/snapshots/abi/WETH9.json
+++ b/packages/contracts-bedrock/snapshots/abi/WETH9.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/AddressManager.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/AddressManager.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/AdminFaucetAuthModule.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/AdminFaucetAuthModule.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/AssetReceiver.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/AssetReceiver.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/AttestationStation.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/AttestationStation.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/BaseFeeVault.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/BaseFeeVault.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/BlockOracle.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/BlockOracle.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/CheckBalanceLow.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/CheckBalanceLow.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/CheckGelatoLow.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/CheckGelatoLow.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/CheckTrue.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/CheckTrue.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/Clone.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/Clone.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/DelayedVetoable.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/DelayedVetoable.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/DeployerWhitelist.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/DeployerWhitelist.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/DisputeGameFactory.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/DisputeGameFactory.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/Drippie.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/Drippie.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/EAS.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/EAS.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/Faucet.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/Faucet.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/FaultDisputeGame.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/FaultDisputeGame.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/GasPriceOracle.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/GasPriceOracle.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/GovernanceToken.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/GovernanceToken.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/L1Block.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/L1Block.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/L1BlockNumber.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/L1BlockNumber.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/L1ChugSplashProxy.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/L1ChugSplashProxy.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/L1CrossDomainMessenger.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/L1CrossDomainMessenger.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/L1ERC721Bridge.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/L1ERC721Bridge.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/L1FeeVault.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/L1FeeVault.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/L1StandardBridge.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/L1StandardBridge.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/L2CrossDomainMessenger.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/L2CrossDomainMessenger.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/L2ERC721Bridge.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/L2ERC721Bridge.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/L2OutputOracle.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/L2OutputOracle.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/L2StandardBridge.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/L2StandardBridge.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/L2ToL1MessagePasser.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/L2ToL1MessagePasser.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/LegacyERC20ETH.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/LegacyERC20ETH.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/LegacyMessagePasser.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/LegacyMessagePasser.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/LegacyMintableERC20.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/LegacyMintableERC20.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/LivenessGuard.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/LivenessGuard.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/LivenessModule.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/LivenessModule.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/MIPS.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/MIPS.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/MintManager.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/MintManager.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/OptimismMintableERC20.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/OptimismMintableERC20.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/OptimismMintableERC20Factory.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/OptimismMintableERC20Factory.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/OptimismMintableERC721.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/OptimismMintableERC721.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/OptimismMintableERC721Factory.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/OptimismMintableERC721Factory.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/OptimismPortal.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/OptimismPortal.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/Optimist.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/Optimist.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/OptimistAllowlist.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/OptimistAllowlist.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/OptimistInviter.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/OptimistInviter.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/PreimageOracle.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/PreimageOracle.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/ProtocolVersions.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/ProtocolVersions.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/Proxy.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/Proxy.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/ProxyAdmin.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/ProxyAdmin.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/ResolvedDelegateProxy.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/ResolvedDelegateProxy.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/SchemaRegistry.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/SchemaRegistry.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/SequencerFeeVault.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/SequencerFeeVault.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/StorageSetter.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/StorageSetter.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/SuperchainConfig.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/SuperchainConfig.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/SystemConfig.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/SystemConfig.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/Transactor.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/Transactor.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/TransferOnion.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/TransferOnion.json
--- a/packages/contracts-bedrock/snapshots/storageLayout/WETH9.json
+++ b/packages/contracts-bedrock/snapshots/storageLayout/WETH9.json
--- a/packages/contracts-bedrock/src/L1/L1CrossDomainMessenger.sol
+++ b/packages/contracts-bedrock/src/L1/L1CrossDomainMessenger.sol
--- a/packages/contracts-bedrock/src/L1/L1ERC721Bridge.sol
+++ b/packages/contracts-bedrock/src/L1/L1ERC721Bridge.sol
--- a/packages/contracts-bedrock/src/L1/L1StandardBridge.sol
+++ b/packages/contracts-bedrock/src/L1/L1StandardBridge.sol
--- a/packages/contracts-bedrock/src/L1/L2OutputOracle.sol
+++ b/packages/contracts-bedrock/src/L1/L2OutputOracle.sol
--- a/packages/contracts-bedrock/src/L1/OptimismPortal.sol
+++ b/packages/contracts-bedrock/src/L1/OptimismPortal.sol
--- a/packages/contracts-bedrock/src/L1/ProtocolVersions.sol
+++ b/packages/contracts-bedrock/src/L1/ProtocolVersions.sol
--- a/packages/contracts-bedrock/src/L1/SuperchainConfig.sol
+++ b/packages/contracts-bedrock/src/L1/SuperchainConfig.sol
--- a/packages/contracts-bedrock/src/L1/SystemConfig.sol
+++ b/packages/contracts-bedrock/src/L1/SystemConfig.sol
--- a/packages/contracts-bedrock/src/L2/L2CrossDomainMessenger.sol
+++ b/packages/contracts-bedrock/src/L2/L2CrossDomainMessenger.sol
--- a/packages/contracts-bedrock/src/L2/L2ERC721Bridge.sol
+++ b/packages/contracts-bedrock/src/L2/L2ERC721Bridge.sol
--- a/packages/contracts-bedrock/src/L2/L2StandardBridge.sol
+++ b/packages/contracts-bedrock/src/L2/L2StandardBridge.sol
--- a/packages/contracts-bedrock/src/cannon/MIPS.sol
+++ b/packages/contracts-bedrock/src/cannon/MIPS.sol
--- a/packages/contracts-bedrock/src/cannon/PreimageKeyLib.sol
+++ b/packages/contracts-bedrock/src/cannon/PreimageKeyLib.sol
--- a/packages/contracts-bedrock/src/cannon/PreimageOracle.sol
+++ b/packages/contracts-bedrock/src/cannon/PreimageOracle.sol
--- a/packages/contracts-bedrock/src/cannon/interfaces/IPreimageOracle.sol
+++ b/packages/contracts-bedrock/src/cannon/interfaces/IPreimageOracle.sol
--- a/packages/contracts-bedrock/src/dispute/FaultDisputeGame.sol
+++ b/packages/contracts-bedrock/src/dispute/FaultDisputeGame.sol
--- a/packages/contracts-bedrock/src/dispute/interfaces/IBigStepper.sol
+++ b/packages/contracts-bedrock/src/dispute/interfaces/IBigStepper.sol
--- a/packages/contracts-bedrock/src/dispute/interfaces/IFaultDisputeGame.sol
+++ b/packages/contracts-bedrock/src/dispute/interfaces/IFaultDisputeGame.sol
--- a/packages/contracts-bedrock/src/libraries/Constants.sol
+++ b/packages/contracts-bedrock/src/libraries/Constants.sol
--- a/packages/contracts-bedrock/src/universal/ERC721Bridge.sol
+++ b/packages/contracts-bedrock/src/universal/ERC721Bridge.sol
--- a/packages/contracts-bedrock/src/universal/OptimismMintableERC20Factory.sol
+++ b/packages/contracts-bedrock/src/universal/OptimismMintableERC20Factory.sol
--- a/packages/contracts-bedrock/src/universal/StandardBridge.sol
+++ b/packages/contracts-bedrock/src/universal/StandardBridge.sol
--- a/packages/contracts-bedrock/test/AssetReceiver.t.sol
+++ b/packages/contracts-bedrock/test/AssetReceiver.t.sol
--- a/packages/contracts-bedrock/test/BenchmarkTest.t.sol
+++ b/packages/contracts-bedrock/test/BenchmarkTest.t.sol
--- a/packages/contracts-bedrock/test/DelayedVetoable.t.sol
+++ b/packages/contracts-bedrock/test/DelayedVetoable.t.sol
--- a/packages/contracts-bedrock/test/Drippie.t.sol
+++ b/packages/contracts-bedrock/test/Drippie.t.sol
--- a/packages/contracts-bedrock/test/FaultDisputeGame.t.sol
+++ b/packages/contracts-bedrock/test/FaultDisputeGame.t.sol
--- a/packages/contracts-bedrock/test/FeeVault.t.sol
+++ b/packages/contracts-bedrock/test/FeeVault.t.sol
--- a/packages/contracts-bedrock/test/Initializable.t.sol
+++ b/packages/contracts-bedrock/test/Initializable.t.sol
--- a/packages/contracts-bedrock/test/L1CrossDomainMessenger.t.sol
+++ b/packages/contracts-bedrock/test/L1CrossDomainMessenger.t.sol
--- a/packages/contracts-bedrock/test/L1StandardBridge.t.sol
+++ b/packages/contracts-bedrock/test/L1StandardBridge.t.sol
--- a/packages/contracts-bedrock/test/L2OutputOracle.t.sol
+++ b/packages/contracts-bedrock/test/L2OutputOracle.t.sol
--- a/packages/contracts-bedrock/test/LibPosition.t.sol
+++ b/packages/contracts-bedrock/test/LibPosition.t.sol
--- a/packages/contracts-bedrock/test/OptimismPortal.t.sol
+++ b/packages/contracts-bedrock/test/OptimismPortal.t.sol
--- a/packages/contracts-bedrock/test/PreimageOracle.t.sol
+++ b/packages/contracts-bedrock/test/PreimageOracle.t.sol
--- a/packages/contracts-bedrock/test/ProtocolVersions.t.sol
+++ b/packages/contracts-bedrock/test/ProtocolVersions.t.sol
--- a/packages/contracts-bedrock/test/SequencerFeeVault.t.sol
+++ b/packages/contracts-bedrock/test/SequencerFeeVault.t.sol
--- a/packages/contracts-bedrock/test/StandardBridge.t.sol
+++ b/packages/contracts-bedrock/test/StandardBridge.t.sol
--- a/packages/contracts-bedrock/test/SuperchainConfig.t.sol
+++ b/packages/contracts-bedrock/test/SuperchainConfig.t.sol
--- a/packages/contracts-bedrock/test/SystemConfig.t.sol
+++ b/packages/contracts-bedrock/test/SystemConfig.t.sol
--- a/packages/contracts-bedrock/test/invariants/SystemConfig.t.sol
+++ b/packages/contracts-bedrock/test/invariants/SystemConfig.t.sol
--- a/packages/contracts-bedrock/test/mocks/AlphabetVM.sol
+++ b/packages/contracts-bedrock/test/mocks/AlphabetVM.sol
--- a/packages/contracts-bedrock/test/mocks/block.json
+++ b/packages/contracts-bedrock/test/mocks/block.json
--- a/packages/contracts-bedrock/test/setup/CommonTest.sol
+++ b/packages/contracts-bedrock/test/setup/CommonTest.sol
--- a/packages/contracts-bedrock/test/setup/Events.sol
+++ b/packages/contracts-bedrock/test/setup/Events.sol
--- a/packages/contracts-bedrock/test/setup/Setup.sol
+++ b/packages/contracts-bedrock/test/setup/Setup.sol
--- a/packages/contracts-ts/package.json
+++ b/packages/contracts-ts/package.json
--- a/packages/core-utils/package.json
+++ b/packages/core-utils/package.json
--- a/packages/fee-estimation/package.json
+++ b/packages/fee-estimation/package.json
--- a/packages/sdk/CHANGELOG.md
+++ b/packages/sdk/CHANGELOG.md
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
--- a/packages/sdk/src/adapters/standard-bridge.ts
+++ b/packages/sdk/src/adapters/standard-bridge.ts
--- a/packages/sdk/src/cross-chain-messenger.ts
+++ b/packages/sdk/src/cross-chain-messenger.ts
--- a/packages/sdk/test/contracts/MockMessenger.sol
+++ b/packages/sdk/test/contracts/MockMessenger.sol
--- a/packages/web3js-plugin/package.json
+++ b/packages/web3js-plugin/package.json
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/proxyd/backend.go
+++ b/proxyd/backend.go
--- a/proxyd/config.go
+++ b/proxyd/config.go
--- a/proxyd/example.config.toml
+++ b/proxyd/example.config.toml
--- a/proxyd/go.mod
+++ b/proxyd/go.mod
--- a/proxyd/go.sum
+++ b/proxyd/go.sum
--- a/proxyd/proxyd.go
+++ b/proxyd/proxyd.go